From 419b4203588ea16da23da025e5ef55d95db15202 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Thu, 31 May 2012 16:08:16 +0100 Subject: tube-{iface,dbus,stream}: remove tubes-channel property Signed-off-by: Jonny Lamb --- src/muc-channel.c | 4 ++-- src/tube-dbus.c | 14 +------------- src/tube-dbus.h | 3 +-- src/tube-iface.c | 13 ------------- src/tube-stream.c | 16 +--------------- src/tube-stream.h | 2 -- src/tubes-manager.c | 4 ++-- 7 files changed, 7 insertions(+), 49 deletions(-) (limited to 'src') diff --git a/src/muc-channel.c b/src/muc-channel.c index e54b6ad3..782d9622 100644 --- a/src/muc-channel.c +++ b/src/muc-channel.c @@ -1653,12 +1653,12 @@ create_new_tube (SalutMucChannel *self, switch (type) { case TP_TUBE_TYPE_DBUS: - tube = SALUT_TUBE_IFACE (salut_tube_dbus_new (conn, NULL, + tube = SALUT_TUBE_IFACE (salut_tube_dbus_new (conn, handle, TP_HANDLE_TYPE_ROOM, self_handle, priv->muc_connection, initiator, service, parameters, tube_id, requested)); break; case TP_TUBE_TYPE_STREAM: - tube = SALUT_TUBE_IFACE (salut_tube_stream_new (conn, NULL, + tube = SALUT_TUBE_IFACE (salut_tube_stream_new (conn, handle, TP_HANDLE_TYPE_ROOM, self_handle, initiator, FALSE, service, parameters, tube_id, portnum, iq_req, requested)); diff --git a/src/tube-dbus.c b/src/tube-dbus.c index aed98c33..0d12086b 100644 --- a/src/tube-dbus.c +++ b/src/tube-dbus.c @@ -93,8 +93,7 @@ static guint signals[LAST_SIGNAL] = {0}; /* properties */ enum { - PROP_TUBES_CHANNEL = 1, - PROP_SELF_HANDLE, + PROP_SELF_HANDLE = 1, PROP_MUC_CONNECTION, PROP_ID, PROP_BYTESTREAM, @@ -113,7 +112,6 @@ enum typedef struct _SalutTubeDBusPrivate SalutTubeDBusPrivate; struct _SalutTubeDBusPrivate { - SalutTubesChannel *tubes_channel; TpHandle self_handle; GibberMucConnection *muc_connection; guint id; @@ -631,9 +629,6 @@ salut_tube_dbus_get_property (GObject *object, switch (property_id) { - case PROP_TUBES_CHANNEL: - g_value_set_object (value, priv->tubes_channel); - break; case PROP_SELF_HANDLE: g_value_set_uint (value, priv->self_handle); break; @@ -690,9 +685,6 @@ salut_tube_dbus_set_property (GObject *object, switch (property_id) { - case PROP_TUBES_CHANNEL: - priv->tubes_channel = g_value_get_object (value); - break; case PROP_SELF_HANDLE: priv->self_handle = g_value_get_uint (value); break; @@ -937,8 +929,6 @@ salut_tube_dbus_class_init (SalutTubeDBusClass *salut_tube_dbus_class) object_class->dispose = salut_tube_dbus_dispose; object_class->finalize = salut_tube_dbus_finalize; - g_object_class_override_property (object_class, PROP_TUBES_CHANNEL, - "tubes-channel"); g_object_class_override_property (object_class, PROP_SELF_HANDLE, "self-handle"); g_object_class_override_property (object_class, PROP_ID, @@ -1310,7 +1300,6 @@ data_received_cb (GibberBytestreamIface *stream, SalutTubeDBus * salut_tube_dbus_new (SalutConnection *conn, - SalutTubesChannel *tubes_channel, TpHandle handle, TpHandleType handle_type, TpHandle self_handle, @@ -1329,7 +1318,6 @@ salut_tube_dbus_new (SalutConnection *conn, tube = g_object_new (gtype, "connection", conn, - "tubes-channel", tubes_channel, "handle", handle, "self-handle", self_handle, "muc-connection", muc_connection, diff --git a/src/tube-dbus.h b/src/tube-dbus.h index d3954ad4..5e617cfc 100644 --- a/src/tube-dbus.h +++ b/src/tube-dbus.h @@ -27,7 +27,6 @@ #include #include "connection.h" -#include "tubes-channel.h" #include #include @@ -67,7 +66,7 @@ GType salut_tube_dbus_get_type (void); SalutTubeDBusClass)) SalutTubeDBus * -salut_tube_dbus_new (SalutConnection *conn, SalutTubesChannel *tubes_channel, +salut_tube_dbus_new (SalutConnection *conn, TpHandle handle, TpHandleType handle_type, TpHandle self_handle, GibberMucConnection *muc_connection, TpHandle initiator, const gchar *service, GHashTable *parameters, guint id, diff --git a/src/tube-iface.c b/src/tube-iface.c index fa866442..6978b074 100644 --- a/src/tube-iface.c +++ b/src/tube-iface.c @@ -22,7 +22,6 @@ #include #include "connection.h" -#include "tubes-channel.h" #include @@ -101,18 +100,6 @@ salut_tube_iface_base_init (gpointer klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_interface_install_property (klass, param_spec); - param_spec = g_param_spec_object ( - "tubes-channel", - "SalutTubesChannel object", - "Salut tubes object that implements the old interface.", - SALUT_TYPE_TUBES_CHANNEL, - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB); - g_object_interface_install_property (klass, param_spec); - param_spec = g_param_spec_uint ( "handle", "Handle", diff --git a/src/tube-stream.c b/src/tube-stream.c index b9782dda..80fee7ea 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -71,7 +71,6 @@ #include "tube-iface.h" #include "si-bytestream-manager.h" #include "contact-manager.h" -#include "tubes-channel.h" static void tube_iface_init (gpointer g_iface, gpointer iface_data); static void streamtube_iface_init (gpointer g_iface, gpointer iface_data); @@ -123,8 +122,7 @@ static guint signals[LAST_SIGNAL] = {0}; /* properties */ enum { - PROP_TUBES_CHANNEL = 1, - PROP_SELF_HANDLE, + PROP_SELF_HANDLE = 1, PROP_ID, PROP_TYPE, PROP_SERVICE, @@ -144,7 +142,6 @@ enum typedef struct _SalutTubeStreamPrivate SalutTubeStreamPrivate; struct _SalutTubeStreamPrivate { - SalutTubesChannel *tubes_channel; TpHandle self_handle; guint id; guint port; @@ -1095,9 +1092,6 @@ salut_tube_stream_get_property (GObject *object, switch (property_id) { - case PROP_TUBES_CHANNEL: - g_value_set_object (value, priv->tubes_channel); - break; case PROP_SELF_HANDLE: g_value_set_uint (value, priv->self_handle); break; @@ -1158,9 +1152,6 @@ salut_tube_stream_set_property (GObject *object, switch (property_id) { - case PROP_TUBES_CHANNEL: - priv->tubes_channel = g_value_get_object (value); - break; case PROP_SELF_HANDLE: priv->self_handle = g_value_get_uint (value); break; @@ -1342,8 +1333,6 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class) object_class->dispose = salut_tube_stream_dispose; object_class->finalize = salut_tube_stream_finalize; - g_object_class_override_property (object_class, PROP_TUBES_CHANNEL, - "tubes-channel"); g_object_class_override_property (object_class, PROP_SELF_HANDLE, "self-handle"); g_object_class_override_property (object_class, PROP_ID, @@ -1522,7 +1511,6 @@ data_received_cb (GibberBytestreamIface *bytestream, SalutTubeStream * salut_tube_stream_new (SalutConnection *conn, - SalutTubesChannel *tubes_channel, TpHandle handle, TpHandleType handle_type, TpHandle self_handle, @@ -1543,7 +1531,6 @@ salut_tube_stream_new (SalutConnection *conn, obj = g_object_new (gtype, "connection", conn, - "tubes-channel", tubes_channel, "handle", handle, "self-handle", self_handle, "initiator-handle", initiator, @@ -2249,7 +2236,6 @@ salut_tube_stream_offer (SalutTubeStream *self, if (cls->target_handle_type == TP_HANDLE_TYPE_CONTACT) { priv->state = TP_TUBE_CHANNEL_STATE_REMOTE_PENDING; - salut_tubes_channel_send_iq_offer (priv->tubes_channel); tp_svc_channel_interface_tube_emit_tube_channel_state_changed ( self, TP_TUBE_CHANNEL_STATE_REMOTE_PENDING); diff --git a/src/tube-stream.h b/src/tube-stream.h index f3d0fd0a..7c5f0f72 100644 --- a/src/tube-stream.h +++ b/src/tube-stream.h @@ -28,7 +28,6 @@ #include "extensions/extensions.h" #include "connection.h" -#include "tubes-channel.h" G_BEGIN_DECLS @@ -66,7 +65,6 @@ GType salut_tube_stream_get_type (void); SalutTubeStreamClass)) SalutTubeStream *salut_tube_stream_new (SalutConnection *conn, - SalutTubesChannel *tubes_channel, TpHandle handle, TpHandleType handle_type, TpHandle self_handle, TpHandle initiator, gboolean offered, const gchar *service, diff --git a/src/tubes-manager.c b/src/tubes-manager.c index 213a0cd0..b3a1136f 100644 --- a/src/tubes-manager.c +++ b/src/tubes-manager.c @@ -723,14 +723,14 @@ create_new_tube (SalutTubesManager *self, if (type == TP_TUBE_TYPE_STREAM) { - tube = SALUT_TUBE_IFACE (salut_tube_stream_new (priv->conn, NULL, + tube = SALUT_TUBE_IFACE (salut_tube_stream_new (priv->conn, handle, TP_HANDLE_TYPE_CONTACT, base_conn->self_handle, base_conn->self_handle, FALSE, service, parameters, tube_id, portnum, iq_req, TRUE)); } else if (type == TP_TUBE_TYPE_DBUS) { - tube = SALUT_TUBE_IFACE (salut_tube_dbus_new (priv->conn, NULL, + tube = SALUT_TUBE_IFACE (salut_tube_dbus_new (priv->conn, handle, TP_HANDLE_TYPE_CONTACT, base_conn->self_handle, NULL, base_conn->self_handle, service, parameters, tube_id, TRUE)); } -- cgit v1.2.1