rpms/gnome-settings-daemon/F-9 gnome-settings-daemon-2.22.2.1-shutdown-cleanly.patch, 1.3, 1.4 gnome-settings-daemon.spec, 1.31, 1.32

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18750

Modified Files:
	gnome-settings-daemon-2.22.2.1-shutdown-cleanly.patch 
	gnome-settings-daemon.spec 
Log Message:
- Shutdown cleanly when bus goes away (bug 445898 again)


gnome-settings-daemon-2.22.2.1-shutdown-cleanly.patch:

Index: gnome-settings-daemon-2.22.2.1-shutdown-cleanly.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-9/gnome-settings-daemon-2.22.2.1-shutdown-cleanly.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-settings-daemon-2.22.2.1-shutdown-cleanly.patch	9 Dec 2008 22:14:23 -0000	1.3
+++ gnome-settings-daemon-2.22.2.1-shutdown-cleanly.patch	10 Dec 2008 20:04:49 -0000	1.4
@@ -154,3 +154,50 @@
  }
  
  static void
+
+============================================================
+ Shutdown properly when bus goes away
+
+  Previously we were just letting libdbus
+call exit(1) for us which bypasses the
+clean up paths.
+
+diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
+--- a/gnome-settings-daemon/main.c
++++ b/gnome-settings-daemon/main.c
+@@ -114,6 +114,21 @@ acquire_name_on_proxy (DBusGProxy *bus_proxy)
+         return ret;
+ }
+ 
++static DBusHandlerResult
++bus_message_handler (DBusConnection *connection,
++                     DBusMessage    *message,
++                     void           *user_data)
++{
++        if (dbus_message_is_signal (message,
++                                    DBUS_INTERFACE_LOCAL,
++                                    "Disconnected")) {
++                gtk_main_quit ();
++                return DBUS_HANDLER_RESULT_HANDLED;
++        }
++
++        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
++}
++
+ static DBusGConnection *
+ get_session_bus (void)
+ {
+@@ -131,7 +146,12 @@ get_session_bus (void)
+         }
+ 
+         connection = dbus_g_connection_get_connection (bus);
+-        dbus_connection_set_exit_on_disconnect (connection, TRUE);
++        dbus_connection_add_filter (connection,
++                                    (DBusHandleMessageFunction)
++                                    bus_message_handler,
++                                    NULL, NULL);
++
++        dbus_connection_set_exit_on_disconnect (connection, FALSE);
+ 
+  out:
+         return bus;


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-9/gnome-settings-daemon.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-settings-daemon.spec	9 Dec 2008 21:16:28 -0000	1.31
+++ gnome-settings-daemon.spec	10 Dec 2008 20:04:49 -0000	1.32
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.22.2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -150,6 +150,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Dec 10 2008 Ray Strode <rstrode at redhat.com> - 2.22.2.1-4
+- Shutdown cleanly when bus goes away (bug 445898 again)
+
 * Tue Dec 9 2008 Ray Strode <rstrode at redhat.com> - 2.22.2.1-3
 - Shutdown cleanly on exit (bug 445898)