Mercurial > pidgin.yaz

changeset 29594:8b04812396b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecessary properties from PurpleMedia's internal structures.
author maiku@pidgin.im
date Tue, 27 Oct 2009 22:02:46 +0000
parents 08e2067d15b3
children 918d4043cc33
files libpurple/media/media.c
diffstat 1 files changed, 0 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/media/media.c	Tue Oct 27 21:59:45 2009 +0000
+++ b/libpurple/media/media.c	Tue Oct 27 22:02:46 2009 +0000
@@ -85,8 +85,6 @@
 
 	GList *active_local_candidates;
 	GList *active_remote_candidates;
-
-	guint connected_cb_id;
 };
 #endif
 
@@ -97,7 +95,6 @@
 	PurpleAccount *account;
 	PurpleMediaBackend *backend;
 	gchar *conference_type;
-	gulong gst_bus_handler_id;
 	gboolean initiator;
 	gpointer prpl_data;
 
@@ -283,10 +280,6 @@
 	if (stream == NULL)
 		return;
 
-	/* Remove the connected_cb timeout */
-	if (stream->connected_cb_id != 0)
-		purple_timeout_remove(stream->connected_cb_id);
-
 	g_free(stream->participant);
 
 	if (stream->local_candidates)
@@ -328,15 +321,6 @@
 		priv->backend = NULL;
 	}
 
-	if (priv->gst_bus_handler_id != 0) {
-		GstElement *pipeline = purple_media_manager_get_pipeline(
-				priv->manager);
-		GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
-		g_signal_handler_disconnect(bus, priv->gst_bus_handler_id);
-		gst_object_unref(bus);
-		priv->gst_bus_handler_id = 0;
-	}
-
 	if (priv->manager) {
 		g_object_unref(priv->manager);
 		priv->manager = NULL;