totem r5458 - in trunk: . src/plugins/mythtv

[hadess svn gnome org]

Author: hadess
Date: Tue Jun 10 09:46:46 2008
New Revision: 5458
URL: http://svn.gnome.org/viewvc/totem?rev=5458&view=rev

Log:
2008-06-10  Bastien Nocera  <hadess hadess net>

	* src/plugins/mythtv/totem-mythtv.c (totem_mythtv_plugin_finalize),
	(impl_deactivate): Kill some more stuff on plugin exit



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

Modified: trunk/src/plugins/mythtv/totem-mythtv.c
==============================================================================
--- trunk/src/plugins/mythtv/totem-mythtv.c	(original)
+++ trunk/src/plugins/mythtv/totem-mythtv.c	Tue Jun 10 09:46:46 2008
@@ -387,6 +387,14 @@
 		g_object_unref (plugin->client);
 		plugin->client = NULL;
 	}
+	if (plugin->upnp != NULL) {
+		g_object_unref (plugin->upnp);
+		plugin->upnp = NULL;
+	}
+	if (plugin->sidebar != NULL) {
+		g_object_unref (plugin->sidebar);
+		plugin->sidebar = NULL;
+	}
 
 	G_OBJECT_CLASS (totem_mythtv_plugin_parent_class)->finalize (object);
 }
@@ -439,13 +447,26 @@
 {
 	TotemMythtvPlugin *tm = TOTEM_MYTHTV_PLUGIN(plugin);
 
-	g_object_unref (tm->sidebar);
 	totem_remove_sidebar_page (totem, "mythtv");
 
-	if (tm && tm->client != NULL) {
+	if (tm->lst_b_info != NULL) {
+		g_list_foreach (tm->lst_b_info, (GFunc ) g_object_unref, NULL);
+		g_list_free (tm->lst_b_info);
+		tm->lst_b_info = NULL;
+	}
+	if (tm->client != NULL) {
 		g_object_unref (tm->client);
 		tm->client = NULL;
 	}
+	if (tm->upnp != NULL) {
+		g_object_unref (tm->upnp);
+		tm->upnp = NULL;
+	}
+	if (tm->sidebar != NULL) {
+		gtk_widget_destroy (tm->sidebar);
+		tm->sidebar = NULL;
+	}
+
 	g_object_unref (totem);
 }