Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > dfbf1ec15938a0227a02af27c8454ff6 > files > 3

libgnomekbd-2.30.2-1.fc13.src.rpm

--- 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);
+		}
 
 	}