rpms/control-center/F-7 control-center-2.18.0-fix-wp-capplet-crash.patch, NONE, 1.1 control-center.spec, 1.252, 1.253

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/control-center/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11968

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.18.0-fix-wp-capplet-crash.patch 
Log Message:
- backport upstream patch for background capplet crash
  (bug 253457)


control-center-2.18.0-fix-wp-capplet-crash.patch:

--- NEW FILE control-center-2.18.0-fix-wp-capplet-crash.patch ---
--- trunk/capplets/background/gnome-wp-capplet.c	2007/03/04 20:42:33	7361
+++ trunk/capplets/background/gnome-wp-capplet.c	2007/04/16 18:15:11	7471
@@ -588,19 +588,23 @@
   gchar * imagepath, * style, * uri;
   GnomeWPItem * item;
 
-  style = gconf_client_get_string (capplet->client,
-				   WP_OPTIONS_KEY,
-				   NULL);
-
   gnome_wp_xml_load_list (capplet);
   g_hash_table_foreach (capplet->wphash, (GHFunc) wp_props_load_wallpaper,
 			capplet);
 
   gdk_window_set_cursor (capplet->window->window, NULL);
   
+  style = gconf_client_get_string (capplet->client,
+				   WP_OPTIONS_KEY,
+				   NULL);
+  if (style == NULL)
+    style = g_strdup ("none");
+
   uri = gconf_client_get_string (capplet->client,
 				 WP_FILE_KEY,
 				 NULL);
+  if (uri == NULL)
+    uri = g_strdup ("(none)");
 
   if (g_utf8_validate (uri, -1, NULL) && g_file_test (uri, G_FILE_TEST_EXISTS))
     imagepath = g_strdup (uri);
@@ -622,7 +626,7 @@
     gnome_wp_option_menu_set (capplet, item->shade_type, TRUE);
 
     gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->pc_picker), item->pcolor);
-    gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->sc_picker), item->pcolor);
+    gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->sc_picker), item->scolor);
 
   } else if (strcmp (style, "none") != 0) {
     item = gnome_wp_add_image (capplet, imagepath);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-7/control-center.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- control-center.spec	22 May 2007 16:46:52 -0000	1.252
+++ control-center.spec	19 Aug 2007 22:35:00 -0000	1.253
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.18.0
-Release: 18%{?dist}
+Release: 19%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -64,6 +64,9 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=236393
 Patch17: control-center-trunk-set-face-perms-4.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=467514
+Patch18: control-center-2.18.0-fix-wp-capplet-crash.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.17.91-passwd.patch
 Patch96: control-center-2.18.0-gecos.patch
@@ -184,6 +187,7 @@
 pushd capplets/about-me/
 %patch17 -p0 -b .face-perms
 popd
+%patch18 -p1 -b .fix-wp-capplet-crash
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -334,6 +338,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Aug 19 2007  Ray Strode <rstrode at redhat.com> - 2.18.0-19
+- backport upstream patch for background capplet crash
+  (bug 253457)
+
 * Tue May 22 2007 - Bastien Nocera <bnocera at redhat.com> - 2.18.0-18
 - And go to the right directory to apply patch17