From 6510e36591c3187ddb926011c0f6e1d4c78a57c7 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Wed, 12 May 2010 14:03:17 +0000
Subject: [shell] Fix name watching

---
diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c
index 30ea718..bdff151 100644
--- a/cut-n-paste/totem-screensaver/totem-scrsaver.c
+++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c
@@ -210,6 +210,9 @@ screensaver_dbus_disappeared_cb (GDBusConnection *connection,
 {
         TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
 
+        if (scr->priv->connection == NULL)
+                return;
+
         g_assert (scr->priv->connection == connection);
         g_object_unref (scr->priv->connection);
         scr->priv->connection = NULL;
diff --git a/shell/ev-media-player-keys.c b/shell/ev-media-player-keys.c
index b848906..da334b6 100644
--- a/shell/ev-media-player-keys.c
+++ b/shell/ev-media-player-keys.c
@@ -166,6 +166,9 @@ mediakeys_service_disappeared_cb (GDBusConnection *connection,
 {
         EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data);
 
+        if (keys->connection == NULL)
+                return;
+
         g_assert (keys->connection == connection);
 
         g_dbus_connection_signal_unsubscribe (connection, keys->subscription_id);
--
cgit v0.9.1