r23419 - in /desktop/experimental/libgnomekbd/debian: changelog control patches/10_gsd_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Mar 28 09:59:05 2010
New Revision: 23419

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23419
Log:
10_gsd_crash.patch: stolen upstream. Avoid a crasher.

Added:
    desktop/experimental/libgnomekbd/debian/patches/10_gsd_crash.patch
Modified:
    desktop/experimental/libgnomekbd/debian/changelog
    desktop/experimental/libgnomekbd/debian/control
    desktop/experimental/libgnomekbd/debian/patches/series

Modified: desktop/experimental/libgnomekbd/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/changelog?rev=23419&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/changelog [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/changelog [utf-8] Sun Mar 28 09:59:05 2010
@@ -5,6 +5,7 @@
   * Bump libxklavier dependency.
   * Drop D-Bus dependencies.
   * 01_requires_private.patch: updated for the new version.
+  * 10_gsd_crash.patch: stolen upstream. Avoid a crasher.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 28 Mar 2010 11:02:15 +0200
 

Modified: desktop/experimental/libgnomekbd/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control?rev=23419&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/control [utf-8] Sun Mar 28 09:59:05 2010
@@ -49,6 +49,7 @@
         ${misc:Depends},
         libgnomekbd-common (>= ${source:Version}),
         iso-codes
+Breaks: gkbd-capplet (<< 2.29)
 Description: GNOME library to manage keyboard configuration - shared library
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
  .

Added: desktop/experimental/libgnomekbd/debian/patches/10_gsd_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/10_gsd_crash.patch?rev=23419&op=file
==============================================================================
--- desktop/experimental/libgnomekbd/debian/patches/10_gsd_crash.patch (added)
+++ desktop/experimental/libgnomekbd/debian/patches/10_gsd_crash.patch [utf-8] Sun Mar 28 09:59:05 2010
@@ -1,0 +1,22 @@
+From 771c2007f51fa5ed0607bbde23d7a5b062e6c5fc Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu at gnome.org>
+Date: Tue, 09 Mar 2010 21:25:00 +0000
+Subject: Unneeded g_object_unref dropped
+
+It caused crash - the resource is not owned.
+https://bugzilla.gnome.org/show_bug.cgi?id=612341
+---
+diff --git a/libgnomekbd/gkbd-indicator-config.c b/libgnomekbd/gkbd-indicator-config.c
+index a34456c..89e6385 100644
+--- a/libgnomekbd/gkbd-indicator-config.c
++++ b/libgnomekbd/gkbd-indicator-config.c
+@@ -175,7 +175,6 @@ gkbd_indicator_config_load_font_from_gconf (GkbdIndicatorConfig *
+ 				     ((double) style->fg[GTK_STATE_NORMAL].
+ 				      blue) / 0x10000);
+ 
+-		g_object_unref (style);
+ 	}
+ }
+ 
+--
+cgit v0.8.3.1

Modified: desktop/experimental/libgnomekbd/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/patches/series?rev=23419&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/patches/series [utf-8] (original)
+++ desktop/experimental/libgnomekbd/debian/patches/series [utf-8] Sun Mar 28 09:59:05 2010
@@ -1,2 +1,3 @@
 01_requires_private.patch
+10_gsd_crash.patch
 99_ltmain_as-needed.patch