totem r5965 - in trunk: . src/plugins/screensaver

[hadess svn gnome org]

Author: hadess
Date: Wed Feb 11 16:18:38 2009
New Revision: 5965
URL: http://svn.gnome.org/viewvc/totem?rev=5965&view=rev

Log:
2009-02-11  Bastien Nocera  <hadess hadess net>

	* src/plugins/screensaver/totem-screensaver.c (impl_activate),
	(impl_deactivate): Fix warning on exit



Modified:
   trunk/ChangeLog
   trunk/src/plugins/screensaver/totem-screensaver.c

Modified: trunk/src/plugins/screensaver/totem-screensaver.c
==============================================================================
--- trunk/src/plugins/screensaver/totem-screensaver.c	(original)
+++ trunk/src/plugins/screensaver/totem-screensaver.c	Wed Feb 11 16:18:38 2009
@@ -55,6 +55,7 @@
 
 	TotemScrsaver *scr;
 	guint          handler_id_playing;
+	guint          handler_id_metadata;
 	guint          handler_id_gconf;
 } TotemScreensaverPlugin;
 
@@ -168,13 +169,13 @@
 	g_object_unref (gc);
 
 	pi->handler_id_playing = g_signal_connect (G_OBJECT (totem),
-				"notify::playing",
-				G_CALLBACK (property_notify_cb),
-				pi);
-	pi->handler_id_playing = g_signal_connect (G_OBJECT (pi->bvw),
-				"got-metadata",
-				G_CALLBACK (got_metadata_cb),
-				pi);
+						   "notify::playing",
+						   G_CALLBACK (property_notify_cb),
+						   pi);
+	pi->handler_id_metadata = g_signal_connect (G_OBJECT (pi->bvw),
+						    "got-metadata",
+						    G_CALLBACK (got_metadata_cb),
+						    pi);
 
 	pi->totem = g_object_ref (totem);
 
@@ -195,7 +196,14 @@
 	gconf_client_notify_remove (gc, pi->handler_id_gconf);
 	g_object_unref (gc);
 
-	g_signal_handler_disconnect (G_OBJECT (totem), pi->handler_id_playing);
+	if (pi->handler_id_playing != 0) {
+		g_signal_handler_disconnect (G_OBJECT (totem), pi->handler_id_playing);
+		pi->handler_id_playing = 0;
+	}
+	if (pi->handler_id_metadata != 0) {
+		g_signal_handler_disconnect (G_OBJECT (pi->bvw), pi->handler_id_metadata);
+		pi->handler_id_metadata = 0;
+	}
 
 	g_object_unref (pi->totem);
 	g_object_unref (pi->bvw);