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



commit 0350176f05e8eec3303a77d5845cc74e1f4af2a8
Author: Rui Matos <tiagomatos gmail com>
Date:   Fri Oct 3 18:09:11 2014 +0200

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

 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 518b89d..1da5e7c 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -2490,6 +2490,8 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
                 g_list_free_full (priv->media_players, (GDestroyNotify) free_media_player);
                 priv->media_players = NULL;
         }
+
+        g_clear_object (&priv->shell_proxy);
 }
 
 static void
@@ -2600,7 +2602,6 @@ gsd_media_keys_manager_finalize (GObject *object)
                 close (media_keys_manager->priv->inhibit_keys_fd);
 
         g_clear_object (&media_keys_manager->priv->screen_saver_proxy);
-        g_clear_object (&media_keys_manager->priv->shell_proxy);
 
         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
 }


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