From 6f3e578c5f96e132587aeda27c341792621af14e Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Tue, 25 May 2010 10:31:29 +0000
Subject: [shell] Make sure we have a proxy before using it in ev-media-player-keys

---
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);
 }
--
cgit v0.9.1