[Xfce4-commits] r30107 - in terminal/trunk: doc/C terminal

[Nick Schermer]

Author: nick
Date: 2009-06-27 21:24:25 +0000 (Sat, 27 Jun 2009)
New Revision: 30107

Modified:
   terminal/trunk/doc/C/Terminal.xml.in
   terminal/trunk/terminal/terminal-preferences.c
   terminal/trunk/terminal/terminal-tab-header.c
Log:
Add hidden option to disable middle-click tab close (bug #4403).


Modified: terminal/trunk/doc/C/Terminal.xml.in
===================================================================
--- terminal/trunk/doc/C/Terminal.xml.in	2009-06-27 21:13:02 UTC (rev 30106)
+++ terminal/trunk/doc/C/Terminal.xml.in	2009-06-27 21:24:25 UTC (rev 30107)
@@ -1317,6 +1317,7 @@
 MiscInheritGeometry=TRUE
 MiscMouseAutohide=FALSE
 MiscTabCloseButtons=TRUE
+MiscTabCloseMiddleClick=TRUE
 MiscTabPosition=GTK_POS_TOP
 MiscHighlightUrls=TRUE</programlisting>
 
@@ -1426,6 +1427,17 @@
         </varlistentry>
 
         <varlistentry>
+          <term><varname>MiscTabCloseMiddleClick</varname></term>
+          <listitem>
+            <para>
+              This setting controls whether &application; will close a terminal tab when
+              the user middle-clicks the tab title. Can be either <literal>TRUE</literal>
+              (the default) or <literal>FALSE</literal>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term><varname>MiscTabPosition</varname></term>
           <listitem>
             <para>

Modified: terminal/trunk/terminal/terminal-preferences.c
===================================================================
--- terminal/trunk/terminal/terminal-preferences.c	2009-06-27 21:13:02 UTC (rev 30106)
+++ terminal/trunk/terminal/terminal-preferences.c	2009-06-27 21:24:25 UTC (rev 30107)
@@ -117,6 +117,7 @@
   PROP_MISC_CONFIRM_CLOSE,
   PROP_MISC_CYCLE_TABS,
   PROP_MISC_TAB_CLOSE_BUTTONS,
+  PROP_MISC_TAB_CLOSE_MIDDLE_CLICK,
   PROP_MISC_TAB_POSITION,
   PROP_MISC_HIGHLIGHT_URLS,
   PROP_SCROLLING_BAR,
@@ -1122,6 +1123,17 @@
                                                          EXO_PARAM_READWRITE));
 
   /**
+   * TerminalPreferences:misc-tab-close-middle-click:
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_MISC_TAB_CLOSE_MIDDLE_CLICK,
+                                   g_param_spec_boolean ("misc-tab-close-middle-click",
+                                                         "misc-tab-close-middle-click",
+                                                         "MiscTabCloseMiddleClick",
+                                                         TRUE,
+                                                         EXO_PARAM_READWRITE));
+
+  /**
    * TerminalPreferences:misc-tab-position:
    **/
   g_object_class_install_property (gobject_class,

Modified: terminal/trunk/terminal/terminal-tab-header.c
===================================================================
--- terminal/trunk/terminal/terminal-tab-header.c	2009-06-27 21:13:02 UTC (rev 30106)
+++ terminal/trunk/terminal/terminal-tab-header.c	2009-06-27 21:24:25 UTC (rev 30107)
@@ -324,6 +324,7 @@
 {
   GtkWidget *image;
   GtkWidget *item;
+  gboolean   close_middle_click;
 
   if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
     {
@@ -361,7 +362,9 @@
       /* close terminal tab on middle-click, to be compatible with
        * tabbed browsers and stuff like pidgin (bug #3380).
        */
-      g_signal_emit (G_OBJECT (header), header_signals[CLOSE_TAB], 0);
+      g_object_get (header->preferences, "misc-tab-close-middle-click", &close_middle_click, NULL);
+      if (close_middle_click)
+        terminal_tab_header_close_tab (NULL, header);
       return TRUE;
     }