rpms/gnome-settings-daemon/devel gnome-settings-daemon-2.24.0-shutdown-cleanly.patch, 1.1, 1.2 gnome-settings-daemon.spec, 1.82, 1.83

[Ray Strode]

Author: rstrode

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

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


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

Index: gnome-settings-daemon-2.24.0-shutdown-cleanly.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.24.0-shutdown-cleanly.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-settings-daemon-2.24.0-shutdown-cleanly.patch	9 Dec 2008 20:58:18 -0000	1.1
+++ gnome-settings-daemon-2.24.0-shutdown-cleanly.patch	10 Dec 2008 20:00:33 -0000	1.2
@@ -207,3 +207,50 @@
          if (p->slowkeys_alert != NULL)
                  gtk_widget_destroy (p->slowkeys_alert);
  
+
+============================================================
+ 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/devel/gnome-settings-daemon.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gnome-settings-daemon.spec	10 Dec 2008 16:24:03 -0000	1.82
+++ gnome-settings-daemon.spec	10 Dec 2008 20:00:33 -0000	1.83
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.25.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -179,6 +179,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Dec 10 2008 Ray Strode <rstrode at redhat.com> - 2.25.2-8
+- Shutdown cleanly when bus goes away (bug 445898 again)
+
 * Wed Dec 10 2008 Ray Strode <rstrode at redhat.com> - 2.25.2-7
 - Don't map touch pad tap to right-click for left-handed
   users (bug 324721)