r32568 - in /desktop/unstable/pygobject/debian: changelog patches/00git_gtkbuilder-signals.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Feb  9 05:56:05 2012
New Revision: 32568

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32568
Log:
Add 00git_gtkbuilder-signals.patch: Fix GtkBuilder signal connection
'after' logic. Backported from upstream git head. (LP: #925676)

Added:
    desktop/unstable/pygobject/debian/patches/00git_gtkbuilder-signals.patch
Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/patches/series

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=32568&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Thu Feb  9 05:56:05 2012
@@ -5,6 +5,8 @@
   * Add 00git_pygspawn_error_check.patch: Fix crash in pygspawn() when the
     argv or envp arguments are not proper sequences. Backported from upstream
     git head.
+  * Add 00git_gtkbuilder-signals.patch: Fix GtkBuilder signal connection
+    'after' logic. Backported from upstream git head. (LP: #925676)
 
  -- Martin Pitt <mpitt at debian.org>  Thu, 09 Feb 2012 06:47:36 +0100
 

Added: desktop/unstable/pygobject/debian/patches/00git_gtkbuilder-signals.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/00git_gtkbuilder-signals.patch?rev=32568&op=file
==============================================================================
--- desktop/unstable/pygobject/debian/patches/00git_gtkbuilder-signals.patch (added)
+++ desktop/unstable/pygobject/debian/patches/00git_gtkbuilder-signals.patch [utf-8] Thu Feb  9 05:56:05 2012
@@ -1,0 +1,31 @@
+From 671f9b0dd73ac41a84caf9d1f04cec351bc01b47 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Wed, 8 Feb 2012 16:06:22 -0500
+Subject: fix GtkBuilder signal connection 'after' logic
+
+All GtkBuilder signals are presently being connected 'after', ignoring
+what is specified in the builder XML.  This is due to an obvious logic
+error.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=669705
+Bug-Ubuntu: https://launchpad.net/bugs/925676 
+---
+ gi/overrides/Gtk.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py
+index 1d0cb49..2b44282 100644
+--- a/gi/overrides/Gtk.py
++++ b/gi/overrides/Gtk.py
+@@ -350,7 +350,7 @@ class Builder(Gtk.Builder):
+             if not _callable(handler):
+                 raise TypeError('Handler %s is not a method or function' % handler_name)
+ 
+-            after = flags or GObject.ConnectFlags.AFTER
++            after = flags & GObject.ConnectFlags.AFTER
+             if connect_obj is not None:
+                 if after:
+                     gobj.connect_object_after(signal_name, handler, connect_obj)
+-- 
+1.7.9
+

Modified: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=32568&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/series [utf-8] Thu Feb  9 05:56:05 2012
@@ -1,2 +1,3 @@
 00git_pygspawn_error_check.patch
+00git_gtkbuilder-signals.patch
 glib_2.30.patch