Mercurial > pidgin.yaz

changeset 28192:47a356df8b5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove send_level and recv_level from PidginMedia.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 07 Aug 2009 08:34:37 +0000
parents c8ff0a9cf8cc
children 5058cdd46464
files pidgin/gtkmedia.c
diffstat 1 files changed, 1 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkmedia.c	Fri Aug 07 08:23:12 2009 +0000
+++ b/pidgin/gtkmedia.c	Fri Aug 07 08:34:37 2009 +0000
@@ -82,8 +82,6 @@
 {
 	PurpleMedia *media;
 	gchar *screenname;
-	GstElement *send_level;
-	GstElement *recv_level;
 	gulong level_handler_id;
 
 	GtkItemFactory *item_factory;
@@ -130,9 +128,7 @@
 enum {
 	PROP_0,
 	PROP_MEDIA,
-	PROP_SCREENNAME,
-	PROP_SEND_LEVEL,
-	PROP_RECV_LEVEL
+	PROP_SCREENNAME
 };
 
 static GType
@@ -183,18 +179,6 @@
 			"The screenname of the user this session is with.",
 			NULL,
 			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-	g_object_class_install_property(gobject_class, PROP_SEND_LEVEL,
-			g_param_spec_object("send-level",
-			"Send level",
-			"The GstElement of this media's send 'level'",
-			GST_TYPE_ELEMENT,
-			G_PARAM_READWRITE));
-	g_object_class_install_property(gobject_class, PROP_RECV_LEVEL,
-			g_param_spec_object("recv-level",
-			"Receive level",
-			"The GstElement of this media's recv 'level'",
-			GST_TYPE_ELEMENT,
-			G_PARAM_READWRITE));
 
 	g_type_class_add_private(klass, sizeof(PidginMediaPrivate));
 }
@@ -384,16 +368,6 @@
 		gtkmedia->priv->item_factory = NULL;
 	}
 
-	if (gtkmedia->priv->send_level) {
-		gst_object_unref(gtkmedia->priv->send_level);
-		gtkmedia->priv->send_level = NULL;
-	}
-
-	if (gtkmedia->priv->recv_level) {
-		gst_object_unref(gtkmedia->priv->recv_level);
-		gtkmedia->priv->recv_level = NULL;
-	}
-
 	G_OBJECT_CLASS(parent_class)->dispose(media);
 }
 
@@ -819,18 +793,6 @@
 				g_free(media->priv->screenname);
 			media->priv->screenname = g_value_dup_string(value);
 			break;
-		case PROP_SEND_LEVEL:
-			if (media->priv->send_level)
-				gst_object_unref(media->priv->send_level);
-			media->priv->send_level = g_value_get_object(value);
-			g_object_ref(media->priv->send_level);
-			break;
-		case PROP_RECV_LEVEL:
-			if (media->priv->recv_level)
-				gst_object_unref(media->priv->recv_level);
-			media->priv->recv_level = g_value_get_object(value);
-			g_object_ref(media->priv->recv_level);
-			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 			break;
@@ -852,12 +814,6 @@
 		case PROP_SCREENNAME:
 			g_value_set_string(value, media->priv->screenname);
 			break;
-		case PROP_SEND_LEVEL:
-			g_value_set_object(value, media->priv->send_level);
-			break;
-		case PROP_RECV_LEVEL:
-			g_value_set_object(value, media->priv->recv_level);
-			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 			break;