[gnome-settings-daemon] media-keys: Don't leak the idle GSource across plugin restarts

[Rui Matos <rtcm src gnome org>]

commit 1436d769a1eecb97d5d2becb1032fed86277566d
Author: Rui Matos <tiagomatos gmail com>
Date:   Fri Oct 3 18:08:15 2014 +0200

    media-keys: Don't leak the idle GSource across plugin restarts
    
    https://bugzilla.gnome.org/show_bug.cgi?id=737798

 plugins/media-keys/gsd-media-keys-manager.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 2b9b745..518b89d 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -2413,6 +2413,11 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
 
         g_debug ("Stopping media_keys manager");
 
+        if (priv->start_idle_id != 0) {
+                g_source_remove (priv->start_idle_id);
+                priv->start_idle_id = 0;
+        }
+
         if (priv->bus_cancellable != NULL) {
                 g_cancellable_cancel (priv->bus_cancellable);
                 g_object_unref (priv->bus_cancellable);
@@ -2591,8 +2596,6 @@ gsd_media_keys_manager_finalize (GObject *object)
 
         g_return_if_fail (media_keys_manager->priv != NULL);
 
-        if (media_keys_manager->priv->start_idle_id != 0)
-                g_source_remove (media_keys_manager->priv->start_idle_id);
         if (media_keys_manager->priv->inhibit_keys_fd != -1)
                 close (media_keys_manager->priv->inhibit_keys_fd);