rpms/control-center/devel screensaver-path.patch, NONE, 1.1 control-center.spec, 1.276, 1.277

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32715

Modified Files:
	control-center.spec 
Added Files:
	screensaver-path.patch 
Log Message:
fix screensaver starting


screensaver-path.patch:

--- NEW FILE screensaver-path.patch ---
--- gnome-control-center-2.19.4/gnome-settings-daemon/gnome-settings-screensaver.c.screensaver-path	2007-06-21 00:35:11.000000000 -0400
+++ gnome-control-center-2.19.4/gnome-settings-daemon/gnome-settings-screensaver.c	2007-06-21 00:36:26.000000000 -0400
@@ -173,7 +173,7 @@ gnome_settings_module_screensaver_start 
 		return FALSE;
 	args[2] = NULL;
 
-	if (g_spawn_async (g_get_home_dir (), args, NULL, 0, NULL, NULL, &module_ss->screensaver_pid, &gerr))
+	if (g_spawn_async (g_get_home_dir (), args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &module_ss->screensaver_pid, &gerr))
 		return TRUE;
 
 	show_error = gconf_client_get_bool (gnome_settings_module_get_config_client (module),


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- control-center.spec	20 Jun 2007 02:48:16 -0000	1.276
+++ control-center.spec	21 Jun 2007 04:50:53 -0000	1.277
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.19.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -31,6 +31,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=449118
 Patch0: loaded-modules.patch
 Patch1: background-idle.patch
+Patch2: screensaver-path.patch
 
 # Remove "Apply" button and just have "Close" instead
 # FIXME: figure out how this applies to the new appearance capplet
@@ -38,12 +39,12 @@
 
 # Optionally bring up beagle or tracker if available
 # FIXME: need to get this filed upstream
-Patch2: control-center-2.19.1-search.patch
+Patch3: control-center-2.19.1-search.patch
 
 # drop help button from a dialog that doesn't have
 # help
 # FIXME: need to get this filed upstream
-Patch3: control-center-2.16.0-about-me-help.patch
+Patch4: control-center-2.16.0-about-me-help.patch
 
 # ubuntu has a better patch for this in the works
 # apparently http://blog.omma.net/?p=16
@@ -172,9 +173,11 @@
 
 %patch0 -p1 -b .loaded-modules
 %patch1 -p1 -b .background-idle
+%patch2 -p1 -b .screensaver-path
+
 #%patch1 -p1 -b .finish
-%patch2 -p1 -b .search
-%patch3 -p1 -b .about-me-help
+%patch3 -p1 -b .search
+%patch4 -p1 -b .about-me-help
 
 #%patch12 -p1 -b .start-at-helper
 %patch13 -p1 -b .no-gnome-common
@@ -337,6 +340,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Jun 21 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.4-4
+- Fix starting of screensavers
+
 * Tue Jun 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.4-3
 - Fix a segfault in the background-setting code