r25314 - in /desktop/unstable/libgnomekbd/debian: changelog patches/10_null_style_crasher.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Oct  6 07:37:56 2010
New Revision: 25314

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25314
Log:
10_null_style_crasher.patch: stolen from upstream git. Fix a crasher 
when there is a font declared but no style. Closes: #589391.

Added:
    desktop/unstable/libgnomekbd/debian/patches/10_null_style_crasher.patch
Modified:
    desktop/unstable/libgnomekbd/debian/changelog
    desktop/unstable/libgnomekbd/debian/patches/series

Modified: desktop/unstable/libgnomekbd/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/changelog?rev=25314&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/changelog [utf-8] Wed Oct  6 07:37:56 2010
@@ -1,3 +1,10 @@
+libgnomekbd (2.30.2-2) UNRELEASED; urgency=low
+
+  * 10_null_style_crasher.patch: stolen from upstream git. Fix a crasher 
+    when there is a font declared but no style. Closes: #589391.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 06 Oct 2010 09:37:03 +0200
+
 libgnomekbd (2.30.2-1) unstable; urgency=low
 
   * New upstream translation and bugfix release.

Added: desktop/unstable/libgnomekbd/debian/patches/10_null_style_crasher.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/patches/10_null_style_crasher.patch?rev=25314&op=file
==============================================================================
--- desktop/unstable/libgnomekbd/debian/patches/10_null_style_crasher.patch (added)
+++ desktop/unstable/libgnomekbd/debian/patches/10_null_style_crasher.patch [utf-8] Wed Oct  6 07:37:56 2010
@@ -1,0 +1,63 @@
+From 1f1c8443a9f3e8527946d976776143a9b047f79a Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu at gnome.org>
+Date: Sat, 15 May 2010 20:59:35 +0000
+Subject: handle style = NULL scenario
+
+https://bugzilla.gnome.org/show_bug.cgi?id=618727
+---
+diff --git a/libgnomekbd/gkbd-indicator-config.c b/libgnomekbd/gkbd-indicator-config.c
+index 1b5a1a2..5cabdcb 100644
+--- a/libgnomekbd/gkbd-indicator-config.c
++++ b/libgnomekbd/gkbd-indicator-config.c
+@@ -110,13 +110,14 @@ gkbd_indicator_config_load_font (GkbdIndicatorConfig * ind_config)
+ 
+ 	if (ind_config->font_family == NULL ||
+ 	    ind_config->font_family[0] == '\0') {
+-		PangoFontDescription *fd;
++		PangoFontDescription *fd = NULL;
+ 		GtkStyle *style =
+ 		    gtk_rc_get_style_by_paths (gtk_settings_get_default (),
+ 					       GTK_STYLE_PATH,
+ 					       GTK_STYLE_PATH,
+ 					       GTK_TYPE_LABEL);
+-		fd = style->font_desc;
++		if (style != NULL)
++			fd = style->font_desc;
+ 		if (fd != NULL) {
+ 			ind_config->font_family =
+ 			    g_strdup (pango_font_description_get_family
+@@ -154,16 +155,22 @@ gkbd_indicator_config_load_colors (GkbdIndicatorConfig * ind_config)
+ 					       GTK_STYLE_PATH,
+ 					       GTK_STYLE_PATH,
+ 					       GTK_TYPE_LABEL);
+-		ind_config->foreground_color =
+-		    g_strdup_printf ("%g %g %g",
+-				     ((double) style->
+-				      fg[GTK_STATE_NORMAL].red) / 0x10000,
+-				     ((double) style->
+-				      fg[GTK_STATE_NORMAL].green) /
+-				     0x10000,
+-				     ((double) style->
+-				      fg[GTK_STATE_NORMAL].blue) /
+-				     0x10000);
++		if (style != NULL) {
++			ind_config->foreground_color =
++			    g_strdup_printf ("%g %g %g", ((double)
++							  style->
++							  fg
++							  [GTK_STATE_NORMAL].red)
++					     / 0x10000, ((double)
++							 style->
++							 fg
++							 [GTK_STATE_NORMAL].green)
++					     / 0x10000, ((double)
++							 style->
++							 fg
++							 [GTK_STATE_NORMAL].blue)
++					     / 0x10000);
++		}
+ 
+ 	}
+ 
+--
+cgit v0.8.3.1

Modified: desktop/unstable/libgnomekbd/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/patches/series?rev=25314&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/patches/series [utf-8] Wed Oct  6 07:37:56 2010
@@ -1,2 +1,3 @@
 01_requires_private.patch
+10_null_style_crasher.patch
 99_ltmain_as-needed.patch