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

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sat May 22 07:46:38 UTC 2010


Author: mrpouit-guest
Date: 2010-05-22 19:46:37 +0000 (Sat, 22 May 2010)
New Revision: 4050

Removed:
   desktop/trunk/xfce4-terminal/debian/patches/01_fix-pref-close-reset-text-properties.patch
Modified:
   desktop/trunk/xfce4-terminal/debian/changelog
   desktop/trunk/xfce4-terminal/debian/control
Log:
* New upstream release.
* debian/patches/01_fix-pref-close-reset-text-properties.patch: dropped,
  included upstream.
* debian/control: add myself to Uploaders.

Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog	2010-05-22 18:36:24 UTC (rev 4049)
+++ desktop/trunk/xfce4-terminal/debian/changelog	2010-05-22 19:46:37 UTC (rev 4050)
@@ -1,4 +1,4 @@
-xfce4-terminal (0.4.4git-20100207-c4f18f1-1) UNRELEASED; urgency=low
+xfce4-terminal (0.4.5-1) UNRELEASED; urgency=low
 
   [ Yves-Alexis Perez ]
   * New upstream snapshot.
@@ -18,6 +18,10 @@
   [ Lionel Le Folgoc ]
   * debian/xfce4-terminal.wrapper: stole code from gnome-terminal to match
     its behavior on '-x' and '-e'.                              closes: #548166
+  * New upstream release.
+  * debian/patches/01_fix-pref-close-reset-text-properties.patch: dropped,
+    included upstream.
+  * debian/control: add myself to Uploaders.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 21 Mar 2010 17:42:54 +0100
 

Modified: desktop/trunk/xfce4-terminal/debian/control
===================================================================
--- desktop/trunk/xfce4-terminal/debian/control	2010-05-22 18:36:24 UTC (rev 4049)
+++ desktop/trunk/xfce4-terminal/debian/control	2010-05-22 19:46:37 UTC (rev 4050)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
- Yves-Alexis Perez <corsac at debian.org>
+ Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7), libdbus-glib-1-dev, 
  libexo-0.3-dev (>= 0.3.100), libvte-dev (>= 1:0.17.1), libxml-perl,
  libstartup-notification0-dev, cdbs, chrpath, intltool, 

Deleted: 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	2010-05-22 18:36:24 UTC (rev 4049)
+++ desktop/trunk/xfce4-terminal/debian/patches/01_fix-pref-close-reset-text-properties.patch	2010-05-22 19:46:37 UTC (rev 4050)
@@ -1,90 +0,0 @@
-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;




More information about the Pkg-xfce-commits mailing list