[gnome-settings-daemon] Revert "main: Ensure session registration happens before other idles"



commit 1d4f68d3ece4002102ed5afa5e17d63300b3113f
Author: Rui Matos <tiagomatos gmail com>
Date:   Wed Oct 24 18:15:33 2012 +0200

    Revert "main: Ensure session registration happens before other idles"
    
    This reverts commit dcb54d8a1c4ecacf6fbe17bdffefdca3b1e6d2d5.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=686814

 gnome-settings-daemon/main.c |   44 ------------------------------------------
 1 files changed, 0 insertions(+), 44 deletions(-)
---
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index efd29a7..fdcb497 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -352,48 +352,6 @@ name_lost_handler (GDBusConnection *connection,
         gtk_main_quit ();
 }
 
-static gboolean
-do_register_client (GDBusProxy *proxy)
-{
-        const char *startup_id;
-
-        g_assert (proxy != NULL);
-
-        startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
-        g_dbus_proxy_call (proxy,
-                           "RegisterClient",
-                           g_variant_new ("(ss)", "gnome-settings-daemon", startup_id ? startup_id : ""),
-                           G_DBUS_CALL_FLAGS_NONE,
-                           -1,
-                           NULL,
-                           (GAsyncReadyCallback) on_client_registered,
-                           manager);
-
-        return FALSE;
-}
-
-static void
-queue_register_client (void)
-{
-        GDBusConnection *bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-        GDBusProxy *proxy;
-
-        if (!bus)
-                return;
-
-        proxy = gnome_settings_session_get_session_proxy ();
-        if (proxy == NULL) {
-                g_debug ("Could not connect to the Session manager");
-                return;
-        }
-
-        /* Register the daemon with gnome-session */
-        g_signal_connect (G_OBJECT (proxy), "g-signal",
-                          G_CALLBACK (on_session_over), NULL);
-
-        g_idle_add_full (G_PRIORITY_DEFAULT, (GSourceFunc) do_register_client, proxy, NULL);
-}
-
 static void
 bus_register (void)
 {
@@ -487,8 +445,6 @@ main (int argc, char *argv[])
 
         notify_init ("gnome-settings-daemon");
 
-        queue_register_client ();
-
         bus_register ();
 
         gnome_settings_profile_start ("gnome_settings_manager_new");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]