rpms/notification-daemon/F-12 notification-daemon.spec, 1.36, 1.37 screensaver-check.patch, 1.1, 1.2

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/notification-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15497

Modified Files:
	notification-daemon.spec screensaver-check.patch 
Log Message:
Don't abort if gnome-screensaver is not running



Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/F-12/notification-daemon.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- notification-daemon.spec	16 Oct 2009 01:35:24 -0000	1.36
+++ notification-daemon.spec	24 Oct 2009 02:52:13 -0000	1.37
@@ -7,7 +7,7 @@
 Summary: Desktop Notification Daemon
 Name: notification-daemon
 Version: 0.4.1
-Release: 0.20090923.3%{?dist}
+Release: 0.20090923.4%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -126,6 +126,9 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1.20090923.4
+- Don't abort if gnome-screensaver is not running (#529592)
+
 * Thu Oct 15 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.1-1.20090923.3
 - Fix issues with the multi-monitor support
 - Make screensaver check work

screensaver-check.patch:
 daemon.c |   55 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

Index: screensaver-check.patch
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/F-12/screensaver-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- screensaver-check.patch	16 Oct 2009 01:35:24 -0000	1.1
+++ screensaver-check.patch	24 Oct 2009 02:52:14 -0000	1.2
@@ -38,7 +38,7 @@
 +	connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 +	if (connection == NULL)
 +	{
-+		g_error("Failed to get dbus connection: %s", error->message);
++		g_warning ("Failed to get dbus connection: %s", error->message);
 +		g_error_free(error);
 +		goto out;
 +
@@ -53,10 +53,10 @@
 +			       G_TYPE_BOOLEAN, &active,
 +			       G_TYPE_INVALID))
 +	{
-+		g_error("Failed to call gnome-screensaver: %s", error->message);
++		g_warning("Failed to call gnome-screensaver: %s", error->message);
 +		g_error_free(error);
 +	}
-+
++       g_object_unref (gs_proxy);
 +out:
  
 -	if (temp_data != NULL)