[Pkg-xfce-commits] r3913 - in desktop/trunk/xfce4-terminal/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-03-21 16:43:25 +0000 (Sun, 21 Mar 2010)
New Revision: 3913

Added:
   desktop/trunk/xfce4-terminal/debian/patches/01_fix-pref-close-reset-text-properties.patch
Modified:
   desktop/trunk/xfce4-terminal/debian/changelog
Log:
01_fix-pref-close-reset-text-properties added, fix “text”
properties being reset when closing terminal preferences on GTK+ 2.18.9.

Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog	2010-03-13 13:36:38 UTC (rev 3912)
+++ desktop/trunk/xfce4-terminal/debian/changelog	2010-03-21 16:43:25 UTC (rev 3913)
@@ -7,6 +7,8 @@
     - update homepage. 
   * debian/patches/
     - 00_binary-name-fix-xfce4-terminal.1 dropped.
+    - 01_fix-pref-close-reset-text-properties added, fix “text”
+      properties being reset when closing terminal preferences on GTK+ 2.18.9.
   * debian/rules:
     - adjust configure options to use xfce4-terminal name.
     - drop all unneeded adjustements to names at install time.
@@ -17,7 +19,7 @@
   * debian/xfce4-terminal.wrapper: stole code from gnome-terminal to match
     its behavior on '-x' and '-e'.                              closes: #548166
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 08 Feb 2010 22:25:19 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 21 Mar 2010 17:42:54 +0100
 
 xfce4-terminal (0.4.3-1) unstable; urgency=low
 

Added: desktop/trunk/xfce4-terminal/debian/patches/01_fix-pref-close-reset-text-properties.patch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/patches/01_fix-pref-close-reset-text-properties.patch	                        (rev 0)
+++ desktop/trunk/xfce4-terminal/debian/patches/01_fix-pref-close-reset-text-properties.patch	2010-03-21 16:43:25 UTC (rev 3913)
@@ -0,0 +1,90 @@
+diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
+index 587bd92..8f33628 100644
+--- a/terminal/terminal-preferences-dialog.c
++++ b/terminal/terminal-preferences-dialog.c
+@@ -64,24 +64,28 @@ terminal_preferences_dialog_class_init (TerminalPreferencesDialogClass *klass)
+ 
+ 
+ #define BIND_PROPERTIES(name, property) \
+-  { object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \
++  G_STMT_START { \
++  object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \
+   terminal_return_if_fail (G_IS_OBJECT (object)); \
+-  exo_mutual_binding_new (G_OBJECT (dialog->preferences), name, \
+-                          G_OBJECT (object), property); }
++  binding = exo_mutual_binding_new (G_OBJECT (dialog->preferences), name, \
++                                    G_OBJECT (object), property); \
++  dialog->bindings = g_slist_prepend (dialog->bindings, binding); \
++  } G_STMT_END
+ 
+ 
+ 
+ static void
+ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
+ {
+-  GError        *error = NULL;
+-  guint          i;
+-  GObject       *object, *object2;
+-  GtkWidget     *editor;
+-  gchar          palette_name[16];
+-  GtkFileFilter *filter;
+-  gchar         *file;
+-  const gchar   *props_active[] = { "title-mode", "command-login-shell",
++  GError           *error = NULL;
++  guint             i;
++  GObject          *object, *object2;
++  GtkWidget        *editor;
++  gchar             palette_name[16];
++  GtkFileFilter    *filter;
++  gchar            *file;
++  ExoMutualBinding *binding;
++  const gchar      *props_active[] = { "title-mode", "command-login-shell",
+                                     "command-update-records", "scrolling-single-line",
+                                     "scrolling-on-output", "scrolling-on-keystroke",
+                                     "scrolling-bar", "font-allow-bold",
+@@ -94,9 +98,9 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
+                                     , "font-anti-alias"
+ #endif
+                                     };
+-  const gchar   *props_color[] =  { "color-foreground", "color-cursor",
+-                                    "color-background", "tab-activity-color",
+-                                    "color-selection" };
++  const gchar      *props_color[] =  { "color-foreground", "color-cursor",
++                                       "color-background", "tab-activity-color",
++                                       "color-selection" };
+ 
+   dialog->preferences = terminal_preferences_get ();
+ 
+@@ -248,6 +252,8 @@ terminal_preferences_dialog_response (GtkWidget                 *widget,
+                                       gint                       response,
+                                       TerminalPreferencesDialog *dialog)
+ {
++  GSList *li;
++
+   /* check if we should open the user manual */
+   if (G_UNLIKELY (response == 1))
+     {
+@@ -256,6 +262,11 @@ terminal_preferences_dialog_response (GtkWidget                 *widget,
+     }
+   else
+     {
++      /* disconnect all the bindings */
++      for (li = dialog->bindings; li != NULL; li = li->next)
++        exo_mutual_binding_unbind (li->data);
++      g_slist_free (dialog->bindings);
++
+       /* close the preferences dialog */
+       gtk_widget_destroy (widget);
+     }
+diff --git a/terminal/terminal-preferences-dialog.h b/terminal/terminal-preferences-dialog.h
+index b2db4f5..268d70a 100644
+--- a/terminal/terminal-preferences-dialog.h
++++ b/terminal/terminal-preferences-dialog.h
+@@ -48,6 +48,7 @@ struct _TerminalPreferencesDialog
+ 
+   TerminalPreferences *preferences;
+   guint                signal_id;
++  GSList              *bindings;
+ };
+ 
+ GType      terminal_preferences_dialog_get_type (void) G_GNUC_CONST;