cpw.maiku.media_refactor: df62408c: Remove unnecessary properties from Purpl...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: df62408c68e8a12f56ff200b90cdf1867ae09479
Ancestor: 47d4eaf94cc2366257694a351b66424924761d1f
Author: maiku at pidgin.im
Date: 2009-10-27T22:02:46
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/df62408c68e8a12f56ff200b90cdf1867ae09479

Modified files:
        libpurple/media/media.c

ChangeLog: 

Remove unnecessary properties from PurpleMedia's internal structures.

-------------- next part --------------
============================================================
--- libpurple/media/media.c	b9677fac7b5926725588b15c52c4a146871df4cf
+++ libpurple/media/media.c	a9b2df028017939342b607233fdc84fee2b92c27
@@ -85,8 +85,6 @@ struct _PurpleMediaStream
 
 	GList *active_local_candidates;
 	GList *active_remote_candidates;
-
-	guint connected_cb_id;
 };
 #endif
 
@@ -97,7 +95,6 @@ struct _PurpleMediaPrivate
 	PurpleAccount *account;
 	PurpleMediaBackend *backend;
 	gchar *conference_type;
-	gulong gst_bus_handler_id;
 	gboolean initiator;
 	gpointer prpl_data;
 
@@ -283,10 +280,6 @@ purple_media_stream_free(PurpleMediaStre
 	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 @@ purple_media_dispose(GObject *media)
 		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;