r23357 - in /desktop/unstable/gtk+2.0/debian: changelog patches/006_gtkentry_avoid_spurious_notifications.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Mar 22 16:05:28 2010
New Revision: 23357

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23357
Log:
* debian/patches/006_gtkentry_avoid_spurious_notifications.patch:
  - Backport patch from upstream git, don't set the buffer to null
    to avoid extra notifications. Closes: #574896.

Added:
    desktop/unstable/gtk+2.0/debian/patches/006_gtkentry_avoid_spurious_notifications.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=23357&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Mon Mar 22 16:05:28 2010
@@ -1,3 +1,11 @@
+gtk+2.0 (2.18.9-2) unstable; urgency=low
+
+  * debian/patches/006_gtkentry_avoid_spurious_notifications.patch:
+    - Backport patch from upstream git, don't set the buffer to null
+      to avoid extra notifications. Closes: #574896.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 22 Mar 2010 17:04:30 +0100
+
 gtk+2.0 (2.18.9-1) unstable; urgency=low
 
   [ Cyril Brulebois ]

Added: desktop/unstable/gtk+2.0/debian/patches/006_gtkentry_avoid_spurious_notifications.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/006_gtkentry_avoid_spurious_notifications.patch?rev=23357&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/006_gtkentry_avoid_spurious_notifications.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/006_gtkentry_avoid_spurious_notifications.patch [utf-8] Mon Mar 22 16:05:28 2010
@@ -1,0 +1,36 @@
+From 0fff51eab6427ca4d0ab679c1d994a2a36898a7d Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Sat, 20 Mar 2010 03:20:38 +0000
+Subject: Avoid spurious notifications from GtkEntry
+
+Using gtk_entry_set_buffer() in dispose() causes problematic
+notifications, so just get rid of the buffer manually. See bug 613241.
+(cherry picked from commit 5f29a679f8a31b6548f34179d65a39de9ec63535)
+---
+diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
+index 4344449..0dafcf7 100644
+--- a/gtk/gtkentry.c
++++ b/gtk/gtkentry.c
+@@ -2425,12 +2425,19 @@ static void
+ gtk_entry_dispose (GObject *object)
+ {
+   GtkEntry *entry = GTK_ENTRY (object);
++  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ 
+   gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
+   gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
+   gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
+   gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
+-  gtk_entry_set_buffer (entry, NULL);
++
++  if (priv->buffer)
++    {
++      buffer_disconnect_signals (entry);
++      g_object_unref (priv->buffer);
++      priv->buffer = NULL;
++    }
+ 
+   G_OBJECT_CLASS (gtk_entry_parent_class)->dispose (object);
+ }
+--
+cgit v0.8.3.1

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=23357&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series [utf-8] Mon Mar 22 16:05:28 2010
@@ -3,6 +3,7 @@
 003_gdk.pc_privates.patch
 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
 005_support_disabling_x11_extensions.patch
+006_gtkentry_avoid_spurious_notifications.patch
 009_gtk-export-filechooser.patch
 010_gdkpixbuf_-lm.patch
 015_default-fallback-icon-theme.patch