[Telepathy-commits] [telepathy-gabble/master] Tube, update to the new spec: remove "Initiator" property
Alban Crequy
alban.crequy at collabora.co.uk
Mon Oct 27 10:48:11 PDT 2008
---
src/tube-dbus.c | 25 +++++++++++++++++++------
src/tube-iface.c | 14 +-------------
src/tube-stream.c | 20 +++-----------------
src/tubes-channel.c | 4 ++--
4 files changed, 25 insertions(+), 38 deletions(-)
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index dacc555..de129b5 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -78,7 +78,7 @@ enum
PROP_BYTESTREAM,
PROP_STREAM_ID,
PROP_TYPE,
- PROP_INITIATOR,
+ PROP_INITIATOR_HANDLE,
PROP_SERVICE,
PROP_PARAMETERS,
PROP_STATE,
@@ -560,7 +560,7 @@ gabble_tube_dbus_get_property (GObject *object,
case PROP_TYPE:
g_value_set_uint (value, TP_TUBE_TYPE_DBUS);
break;
- case PROP_INITIATOR:
+ case PROP_INITIATOR_HANDLE:
g_value_set_uint (value, priv->initiator);
break;
case PROP_SERVICE:
@@ -635,7 +635,7 @@ gabble_tube_dbus_set_property (GObject *object,
g_free (priv->stream_id);
priv->stream_id = g_value_dup_string (value);
break;
- case PROP_INITIATOR:
+ case PROP_INITIATOR_HANDLE:
priv->initiator = g_value_get_uint (value);
break;
case PROP_SERVICE:
@@ -769,8 +769,6 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
"id");
g_object_class_override_property (object_class, PROP_TYPE,
"type");
- g_object_class_override_property (object_class, PROP_INITIATOR,
- "initiator");
g_object_class_override_property (object_class, PROP_SERVICE,
"service");
g_object_class_override_property (object_class, PROP_PARAMETERS,
@@ -778,6 +776,21 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
g_object_class_override_property (object_class, PROP_STATE,
"state");
+ /* TODO: When D-Bus tubes will be channels, this will be replaced by
+ * g_object_class_override_property*/
+ param_spec = g_param_spec_uint (
+ "initiator-handle",
+ "Initiator handle",
+ "The TpHandle of the initiator of this tube object.",
+ 0, G_MAXUINT32, 0,
+ G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_NAME |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB);
+ g_object_class_install_property (object_class, PROP_INITIATOR_HANDLE,
+ param_spec);
+
param_spec = g_param_spec_object (
"bytestream",
"Object implementing the GabbleBytestreamIface interface",
@@ -1085,7 +1098,7 @@ gabble_tube_dbus_new (GabbleConnection *conn,
"handle", handle,
"handle-type", handle_type,
"self-handle", self_handle,
- "initiator", initiator,
+ "initiator-handle", initiator,
"service", service,
"parameters", parameters,
"stream-id", stream_id,
diff --git a/src/tube-iface.c b/src/tube-iface.c
index 29def57..65f6d38 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -137,18 +137,6 @@ gabble_tube_iface_base_init (gpointer klass)
G_PARAM_STATIC_BLURB);
g_object_interface_install_property (klass, param_spec);
- param_spec = g_param_spec_uint (
- "initiator",
- "Initiator handle",
- "The TpHandle of the initiator of this tube object.",
- 0, G_MAXUINT32, 0,
- 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_string (
"service",
"service name",
@@ -229,7 +217,7 @@ gabble_tube_iface_publish_in_node (GabbleTubeIface *tube,
g_object_get (G_OBJECT (tube),
"type", &type,
- "initiator", &initiator_handle,
+ "initiator-handle", &initiator_handle,
"service", &service,
"parameters", ¶meters,
"id", &tube_id,
diff --git a/src/tube-stream.c b/src/tube-stream.c
index ce9ab0d..153f90f 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -115,7 +115,6 @@ enum
PROP_SELF_HANDLE,
PROP_ID,
PROP_TYPE,
- PROP_INITIATOR,
PROP_SERVICE,
PROP_PARAMETERS,
PROP_STATE,
@@ -1005,7 +1004,7 @@ gabble_tube_stream_get_property (GObject *object,
case PROP_TYPE:
g_value_set_uint (value, TP_TUBE_TYPE_STREAM);
break;
- case PROP_INITIATOR:
+ case PROP_INITIATOR_HANDLE:
g_value_set_uint (value, priv->initiator);
break;
case PROP_SERVICE:
@@ -1071,9 +1070,6 @@ gabble_tube_stream_get_property (GObject *object,
tp_handle_inspect (repo, priv->handle));
}
break;
- case PROP_INITIATOR_HANDLE:
- g_value_set_uint (value, priv->initiator);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@@ -1115,7 +1111,7 @@ gabble_tube_stream_set_property (GObject *object,
case PROP_ID:
priv->id = g_value_get_uint (value);
break;
- case PROP_INITIATOR:
+ case PROP_INITIATOR_HANDLE:
priv->initiator = g_value_get_uint (value);
break;
case PROP_SERVICE:
@@ -1150,13 +1146,6 @@ gabble_tube_stream_set_property (GObject *object,
g_value_get_pointer (value));
}
break;
- case PROP_INITIATOR_HANDLE:
- /* PROP_INITIATOR_HANDLE and PROP_INITIATOR are the same property from
- * two different interfaces (Channel and
- * Channel.Interface.Tube.DRAFT). In case of tube channels, this can
- * never be 0. The value is stored in priv->initiator. The object is
- * created only with PROP_INITIATOR set, so do nothing here. */
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@@ -1265,7 +1254,6 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
{ NULL }
};
static TpDBusPropertiesMixinPropImpl tube_iface_props[] = {
- { "Initiator", "initiator", NULL },
{ "Parameters", "parameters", "parameters" },
{ "Status", "state", NULL },
{ NULL }
@@ -1317,8 +1305,6 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
"id");
g_object_class_override_property (object_class, PROP_TYPE,
"type");
- g_object_class_override_property (object_class, PROP_INITIATOR,
- "initiator");
g_object_class_override_property (object_class, PROP_SERVICE,
"service");
g_object_class_override_property (object_class, PROP_PARAMETERS,
@@ -1506,7 +1492,7 @@ gabble_tube_stream_new (GabbleConnection *conn,
"handle", handle,
"handle-type", handle_type,
"self-handle", self_handle,
- "initiator", initiator,
+ "initiator-handle", initiator,
"service", service,
"parameters", parameters,
"id", id,
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 938d765..c4ef2cb 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -931,7 +931,7 @@ copy_tube_in_ptr_array (gpointer key,
g_object_get (tube,
"type", &type,
- "initiator", &initiator,
+ "initiator-handle", &initiator,
"service", &service,
"parameters", ¶meters,
"state", &state,
@@ -1069,7 +1069,7 @@ publish_tubes_in_node (gpointer key,
g_object_get (tube,
"state", &state,
"type", &type,
- "initiator", &initiator,
+ "initiator-handle", &initiator,
NULL);
if (state != TP_TUBE_STATE_OPEN)
--
1.5.6.5
More information about the Telepathy-commits
mailing list