[gnome-settings-daemon] media-keys: Only start D-Bus when _start() is called

[Bastien Nocera <hadess src gnome org>]

commit 82937e1461dd9d9df654263f4d8b7d216f87bd1c
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jun 3 00:08:55 2011 +0100

    media-keys: Only start D-Bus when _start() is called
    
    Not before, as we might end up having something call us when
    we haven't actually started yet.

 plugins/media-keys/gsd-media-keys-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 63e3849..b7e177b 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1468,6 +1468,8 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
 #endif /* HAVE_PULSE */
         manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
 
+        register_manager (manager_object);
+
         gnome_settings_profile_end (NULL);
 
         return TRUE;
@@ -1709,7 +1711,6 @@ gsd_media_keys_manager_new (void)
                 manager_object = g_object_new (GSD_TYPE_MEDIA_KEYS_MANAGER, NULL);
                 g_object_add_weak_pointer (manager_object,
                                            (gpointer *) &manager_object);
-                register_manager (manager_object);
         }
 
         return GSD_MEDIA_KEYS_MANAGER (manager_object);