pidgin: 82204c4b: Remove send_level and recv_level from Pi...
maiku at soc.pidgin.im
maiku at soc.pidgin.im
Fri Aug 7 04:40:55 EDT 2009
-----------------------------------------------------------------
Revision: 82204c4b8e636617e72c31b471d4f81e85194540
Ancestor: b058e8d1dd1286236c300b19b5608f89d148ceec
Author: maiku at soc.pidgin.im
Date: 2009-08-07T08:34:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/82204c4b8e636617e72c31b471d4f81e85194540
Modified files:
pidgin/gtkmedia.c
ChangeLog:
Remove send_level and recv_level from PidginMedia.
-------------- next part --------------
============================================================
--- pidgin/gtkmedia.c 4285473b74826b5b71020d5a0246bac6c5e092c3
+++ pidgin/gtkmedia.c 8f69a8ebac5f2949da0dcbc37ba7fe654012543c
@@ -82,8 +82,6 @@ struct _PidginMediaPrivate
{
PurpleMedia *media;
gchar *screenname;
- GstElement *send_level;
- GstElement *recv_level;
gulong level_handler_id;
GtkItemFactory *item_factory;
@@ -130,9 +128,7 @@ enum {
enum {
PROP_0,
PROP_MEDIA,
- PROP_SCREENNAME,
- PROP_SEND_LEVEL,
- PROP_RECV_LEVEL
+ PROP_SCREENNAME
};
static GType
@@ -183,18 +179,6 @@ pidgin_media_class_init (PidginMediaClas
"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 @@ pidgin_media_dispose(GObject *media)
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 @@ pidgin_media_set_property (GObject *obje
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 @@ pidgin_media_get_property (GObject *obje
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;
More information about the Commits
mailing list