[Telepathy-commits] [telepathy-gabble/master] GabbleTubeIface, GabbleTubeDBus, GabbleTubeStream: use G_PARAM_STATIC_STRINGS
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Nov 5 03:33:34 PST 2008
---
src/tube-dbus.c | 32 ++++++--------------------------
src/tube-iface.c | 51 +++++++++------------------------------------------
src/tube-stream.c | 35 +++++++++--------------------------
3 files changed, 24 insertions(+), 94 deletions(-)
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 85720d7..be8c7b1 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -791,11 +791,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
"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_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_INITIATOR_HANDLE,
param_spec);
@@ -805,10 +801,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
"Bytestream object used for streaming data for this"
"tube object.",
G_TYPE_OBJECT,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_BYTESTREAM,
param_spec);
@@ -817,11 +810,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
"stream id",
"The identifier of this tube's bytestream",
"",
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_STREAM_ID,
param_spec);
@@ -830,10 +819,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
"D-Bus address",
"The D-Bus address on which this tube will listen for connections",
"",
- G_PARAM_READABLE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_DBUS_ADDRESS,
param_spec);
@@ -842,10 +828,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
"D-Bus name",
"The local D-Bus name on the virtual bus (used for muc tubes only).",
"",
- G_PARAM_READABLE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_DBUS_NAME, param_spec);
param_spec = g_param_spec_boxed (
@@ -853,10 +836,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
"D-Bus names",
"Mapping of contact handles to D-Bus names (used for muc tubes only).",
G_TYPE_HASH_TABLE,
- G_PARAM_READABLE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_DBUS_NAMES, param_spec);
signals[OPENED] =
diff --git a/src/tube-iface.c b/src/tube-iface.c
index 3aa5a71..0a819d0 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -68,11 +68,7 @@ gabble_tube_iface_base_init (gpointer klass)
"GabbleConnection object",
"Gabble connection object that owns this tube object.",
GABBLE_TYPE_CONNECTION,
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_interface_install_property (klass, param_spec);
param_spec = g_param_spec_uint (
@@ -81,11 +77,7 @@ gabble_tube_iface_base_init (gpointer klass)
"The TpHandle associated with the tubes channel that"
"owns 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_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_interface_install_property (klass, param_spec);
param_spec = g_param_spec_uint (
@@ -94,11 +86,7 @@ gabble_tube_iface_base_init (gpointer klass)
"The TpHandleType of the handle associated with the tubes channel"
"that owns 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_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_interface_install_property (klass, param_spec);
param_spec = g_param_spec_uint (
@@ -107,11 +95,7 @@ gabble_tube_iface_base_init (gpointer klass)
"The handle to use for ourself. This can be different from the "
"connection's self handle if our handle is a room handle.",
0, G_MAXUINT, 0,
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_interface_install_property (klass, param_spec);
param_spec = g_param_spec_uint (
@@ -119,11 +103,7 @@ gabble_tube_iface_base_init (gpointer klass)
"id",
"The unique identifier of this tube",
0, G_MAXUINT32, 0,
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_interface_install_property (klass, param_spec);
param_spec = g_param_spec_uint (
@@ -131,10 +111,7 @@ gabble_tube_iface_base_init (gpointer klass)
"Tube type",
"The TpTubeType this tube object.",
0, G_MAXUINT32, 0,
- G_PARAM_READABLE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_interface_install_property (klass, param_spec);
param_spec = g_param_spec_string (
@@ -142,11 +119,7 @@ gabble_tube_iface_base_init (gpointer klass)
"service name",
"the service associated with this tube object.",
"",
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_interface_install_property (klass, param_spec);
param_spec = g_param_spec_boxed (
@@ -154,10 +127,7 @@ gabble_tube_iface_base_init (gpointer klass)
"parameters GHashTable",
"GHashTable containing parameters of this tube object.",
TP_HASH_TYPE_STRING_VARIANT_MAP,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_interface_install_property (klass, param_spec);
param_spec = g_param_spec_uint (
@@ -165,10 +135,7 @@ gabble_tube_iface_base_init (gpointer klass)
"Tube state",
"The GabbleTubeState of this tube object",
0, G_MAXUINT32, TP_TUBE_STATE_REMOTE_PENDING,
- G_PARAM_READABLE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_interface_install_property (klass, param_spec);
initialized = TRUE;
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 8595433..e5ee71f 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1337,8 +1337,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
"Supported socket types",
"GHashTable containing supported socket types.",
dbus_g_type_get_map ("GHashTable", G_TYPE_UINT, DBUS_TYPE_G_UINT_ARRAY),
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_SUPPORTED_SOCKET_TYPES,
param_spec);
@@ -1349,10 +1348,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
"address of the local service",
0, NUM_TP_SOCKET_ADDRESS_TYPES - 1,
TP_SOCKET_ADDRESS_TYPE_UNIX,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_ADDRESS_TYPE,
param_spec);
@@ -1361,10 +1357,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
"address",
"The listening address of the local service, as indicated by the "
"address-type",
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_ADDRESS, param_spec);
param_spec = g_param_spec_uint (
@@ -1374,10 +1367,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
"the local service applies to the local socket",
0, NUM_TP_SOCKET_ACCESS_CONTROLS - 1,
TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_ACCESS_CONTROL,
param_spec);
@@ -1386,10 +1376,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
"access control param",
"A parameter for the access control type, to be interpreted as specified"
"in the documentation for the Socket_Access_Control enum.",
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_ACCESS_CONTROL_PARAM,
param_spec);
@@ -1402,31 +1389,27 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
param_spec = g_param_spec_string ("target-id", "Target JID",
"The string obtained by inspecting the target handle",
NULL,
- G_PARAM_READABLE |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_TARGET_ID, param_spec);
param_spec = g_param_spec_uint ("initiator-handle", "Initiator's handle",
"The contact who initiated the channel",
0, G_MAXUINT32, 0,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_INITIATOR_HANDLE,
param_spec);
param_spec = g_param_spec_string ("initiator-id", "Initiator's bare JID",
"The string obtained by inspecting the initiator-handle",
NULL,
- G_PARAM_READABLE |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_INITIATOR_ID,
param_spec);
param_spec = g_param_spec_boolean ("requested", "Requested?",
"True if this channel was requested by the local user",
FALSE,
- G_PARAM_READABLE |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_REQUESTED, param_spec);
signals[OPENED] =
--
1.5.6.5
More information about the Telepathy-commits
mailing list