rpms/libgnomekbd/F-13 style-crash.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 libgnomekbd.spec, 1.59, 1.60 sources, 1.27, 1.28

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17247

Modified Files:
	.cvsignore libgnomekbd.spec sources 
Added Files:
	style-crash.patch 
Log Message:
fix a frequent crasher


style-crash.patch:
 gkbd-indicator-config.c |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

--- NEW FILE style-crash.patch ---
--- libgnomekbd-2.30.2/libgnomekbd/gkbd-indicator-config.c.old	2010-05-15 19:51:29.000000000 +0200
+++ libgnomekbd-2.30.2/libgnomekbd/gkbd-indicator-config.c	2010-05-15 19:52:12.000000000 +0200
@@ -110,13 +110,14 @@
 
 	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,16 @@
 					       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);
+		}
 
 	}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-13/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	9 Mar 2010 14:49:07 -0000	1.25
+++ .cvsignore	14 Jul 2010 14:52:42 -0000	1.26
@@ -1 +1 @@
-libgnomekbd-2.29.92.tar.bz2
+libgnomekbd-2.30.2.tar.bz2


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-13/libgnomekbd.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- libgnomekbd.spec	11 May 2010 16:30:55 -0000	1.59
+++ libgnomekbd.spec	14 Jul 2010 14:52:43 -0000	1.60
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:        2.30.1
-Release:        2%{?dist}
+Version:        2.30.2
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -26,8 +26,8 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-# upstream fix
-Patch0: libgnomekbd-crash.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=618727
+Patch1: style-crash.patch
 
 %description
 The libgnomekbd package contains a GNOME library which manages
@@ -62,7 +62,7 @@ of the keyboard indicator applet.
 
 %prep
 %setup -q
-%patch0 -p1 -b .crash
+%patch1 -p1 -b .crash
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -128,6 +128,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Jul 14 2010 Matthias Clasen <mclasen at redhat.com> 2.30.2-1
+- Update to 2.30.2, which fixes a number of crashes
+- Include another crash fix (#611580)
+
 * Tue May 11 2010 Matthias Clasen <mclasen at redhat.com> 2.30.1-2
 - Fix a crash due to a race condition at login
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-13/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	27 Apr 2010 00:12:35 -0000	1.27
+++ sources	14 Jul 2010 14:52:43 -0000	1.28
@@ -1 +1 @@
-9b828a4e35089d91b9ea16ddf981ff28  libgnomekbd-2.30.1.tar.bz2
+2fe73ebfd40801655e0aa3f85cefa873  libgnomekbd-2.30.2.tar.bz2