From 02cc8f0b560396b33490174595442d7a4909839c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Oct 24 2009 02:52:14 +0000 Subject: Don't abort if gnome-screensaver is not running --- diff --git a/notification-daemon.spec b/notification-daemon.spec index da1d3b9..d82a41e 100644 --- a/notification-daemon.spec +++ b/notification-daemon.spec @@ -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 - 0.4.1-1.20090923.4 +- Don't abort if gnome-screensaver is not running (#529592) + * Thu Oct 15 2009 Matthias Clasen - 0.4.1-1.20090923.3 - Fix issues with the multi-monitor support - Make screensaver check work diff --git a/screensaver-check.patch b/screensaver-check.patch index 1f8660f..c7bc0aa 100644 --- a/screensaver-check.patch +++ b/screensaver-check.patch @@ -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)