Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell/ev-media-player-keys.c
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2010-05-25 10:31:29 (GMT)
committer Carlos Garcia Campos <carlosgc@gnome.org>2010-05-25 10:31:29 (GMT)
commit6f3e578c5f96e132587aeda27c341792621af14e (patch)
tree2f2130c81dd1ceab48f5080d291b8d22fb5307d4 /shell/ev-media-player-keys.c
parent4da16e0c0882f8eec36c06aeeb86fe0116fbd025 (diff)
[shell] Make sure we have a proxy before using it in ev-media-player-keys
Diffstat (limited to 'shell/ev-media-player-keys.c')
-rw-r--r--shell/ev-media-player-keys.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/ev-media-player-keys.c b/shell/ev-media-player-keys.c
index c8f3418..efc32dc 100644
--- a/shell/ev-media-player-keys.c
+++ b/shell/ev-media-player-keys.c
@@ -189,13 +189,13 @@ ev_media_player_keys_finalize (GObject *object)
{
EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (object);
- ev_media_player_keys_release_keys (keys);
-
if (keys->watch_id > 0)
g_bus_unwatch_proxy (keys->watch_id);
- if (keys->proxy != NULL)
+ if (keys->proxy != NULL) {
+ ev_media_player_keys_release_keys (keys);
g_object_unref (keys->proxy);
+ }
G_OBJECT_CLASS (ev_media_player_keys_parent_class)->finalize (object);
}