summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2012-03-26 17:56:59 -0400
committerJonny Lamb <jonny.lamb@collabora.co.uk>2012-05-18 09:09:46 +0100
commitaaf6e953cecd6886f8834abd9ebea9422611eed4 (patch)
tree3db070b12ecf5a0213d5fafa0ba8baff5017b60b
parent2e2c980f693c43964d28e8511e08b8e0667671e9 (diff)
muc-channel: remove "tube" property
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--src/muc-channel.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/muc-channel.c b/src/muc-channel.c
index fda9200c5..8ed693c06 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -138,7 +138,6 @@ enum
PROP_INVITATION_MESSAGE,
PROP_SELF_JID,
PROP_WOCKY_MUC,
- PROP_TUBE,
PROP_INITIAL_CHANNELS,
PROP_INITIAL_INVITEE_HANDLES,
PROP_INITIAL_INVITEE_IDS,
@@ -208,7 +207,6 @@ struct _GabbleMucChannelPrivate
gchar *invitation_message;
WockyMuc *wmuc;
- GabbleTubesChannel *tube;
/* tube ID => owned GabbleTubeIface */
GHashTable *tubes;
@@ -367,8 +365,6 @@ gabble_muc_channel_constructed (GObject *obj)
if (chain_up != NULL)
chain_up (obj);
- priv->tube = NULL;
-
room_handles = tp_base_connection_get_handles (base_conn,
TP_HANDLE_TYPE_ROOM);
contact_handles = tp_base_connection_get_handles (base_conn,
@@ -880,9 +876,6 @@ gabble_muc_channel_get_property (GObject *object,
case PROP_SELF_JID:
g_value_set_string (value, priv->self_jid->str);
break;
- case PROP_TUBE:
- g_value_set_object (value, priv->tube);
- break;
case PROP_WOCKY_MUC:
g_value_set_object (value, priv->wmuc);
break;
@@ -1099,11 +1092,6 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class)
g_object_class_install_property (object_class, PROP_SELF_JID,
param_spec);
- param_spec = g_param_spec_object ("tube", "Tube Channel",
- "The GabbleTubesChannel associated with this MUC (if any)",
- GABBLE_TYPE_TUBES_CHANNEL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
- g_object_class_install_property (object_class, PROP_TUBE, param_spec);
-
param_spec = g_param_spec_object ("wocky-muc", "Wocky MUC Object",
"The backend (Wocky) MUC instance",
WOCKY_TYPE_MUC, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);