r33128 - in /packages/unstable/pygobject-2/debian: changelog patches/00git_fix_qdata_warning.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Mar 13 17:46:21 2012
New Revision: 33128

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33128
Log:
Add 00git_fix_qdata_warning.patch: Fix set_qdata warning on accessing NULL
gobject property. Backported from upstream git.

Added:
    packages/unstable/pygobject-2/debian/patches/00git_fix_qdata_warning.patch
Modified:
    packages/unstable/pygobject-2/debian/changelog
    packages/unstable/pygobject-2/debian/patches/series

Modified: packages/unstable/pygobject-2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pygobject-2/debian/changelog?rev=33128&op=diff
==============================================================================
--- packages/unstable/pygobject-2/debian/changelog [utf-8] (original)
+++ packages/unstable/pygobject-2/debian/changelog [utf-8] Tue Mar 13 17:46:21 2012
@@ -1,6 +1,11 @@
 pygobject-2 (2.28.6-10) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Update repository URL.
+
+  [ Martin Pitt ]
+  * Add 00git_fix_qdata_warning.patch: Fix set_qdata warning on accessing NULL
+    gobject property. Backported from upstream git.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 31 Dec 2011 14:55:08 +0100
 

Added: packages/unstable/pygobject-2/debian/patches/00git_fix_qdata_warning.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pygobject-2/debian/patches/00git_fix_qdata_warning.patch?rev=33128&op=file
==============================================================================
--- packages/unstable/pygobject-2/debian/patches/00git_fix_qdata_warning.patch (added)
+++ packages/unstable/pygobject-2/debian/patches/00git_fix_qdata_warning.patch [utf-8] Tue Mar 13 17:46:21 2012
@@ -1,0 +1,28 @@
+From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001
+From: Ivan Stankovic <ivan.stankovic at avl.com>
+Date: Tue, 21 Feb 2012 12:24:58 +0100
+Subject: [PATCH 1/2] Fix set_qdata warning on accessing NULL gobject property
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661155
+---
+ gobject/pygobject.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/gobject/pygobject.c b/gobject/pygobject.c
+index 6c2f06c..70dc89a 100644
+--- a/gobject/pygobject.c
++++ b/gobject/pygobject.c
+@@ -991,7 +991,9 @@ pygobject_new(GObject *obj)
+ PyObject *
+ pygobject_new_sunk(GObject *obj)
+ {
+-    g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
++    if (obj)
++       g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
++       
+     return pygobject_new_full(obj, TRUE, NULL);
+ }
+ 
+-- 
+1.7.9.1
+

Modified: packages/unstable/pygobject-2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pygobject-2/debian/patches/series?rev=33128&op=diff
==============================================================================
--- packages/unstable/pygobject-2/debian/patches/series [utf-8] (original)
+++ packages/unstable/pygobject-2/debian/patches/series [utf-8] Tue Mar 13 17:46:21 2012
@@ -6,4 +6,5 @@
 00git_messagebox_type.patch
 00git_python3_build.patch
 00git_python3-maketrans.patch
+00git_fix_qdata_warning.patch
 20_deprecated_spam.patch