[Telepathy-commits] [telepathy-gabble/master] GabbleOLPC*: use G_PARAM_STATIC_STRINGS
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Nov 5 03:33:11 PST 2008
---
src/olpc-activity-view.c | 6 ++----
src/olpc-activity.c | 24 ++++--------------------
src/olpc-buddy-view.c | 6 ++----
src/olpc-view.c | 30 ++++++++++--------------------
4 files changed, 18 insertions(+), 48 deletions(-)
diff --git a/src/olpc-activity-view.c b/src/olpc-activity-view.c
index 6d29599..c266076 100644
--- a/src/olpc-activity-view.c
+++ b/src/olpc-activity-view.c
@@ -421,8 +421,7 @@ gabble_olpc_activity_view_class_init (
"View's search properties",
"The activity properties Gadget should look for",
TP_HASH_TYPE_STRING_VARIANT_MAP,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_VIEW_PROPERTIES,
param_spec);
@@ -430,8 +429,7 @@ gabble_olpc_activity_view_class_init (
"View's search participants",
"The activity participants Gadget should look for",
GABBLE_ARRAY_TYPE_HANDLE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_PARTICIPANTS,
param_spec);
diff --git a/src/olpc-activity.c b/src/olpc-activity.c
index 3a15cb1..5d72f7d 100644
--- a/src/olpc-activity.c
+++ b/src/olpc-activity.c
@@ -220,11 +220,7 @@ gabble_olpc_activity_class_init (
"GabbleConnection object",
"Gabble connection object that owns this activity 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_class_install_property (object_class, PROP_CONNECTION, param_spec);
param_spec = g_param_spec_uint (
@@ -232,11 +228,7 @@ gabble_olpc_activity_class_init (
"activity room",
"a TpHandle representing the activity room",
0, G_MAXUINT, 0,
- G_PARAM_CONSTRUCT |
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_ROOM, param_spec);
param_spec = g_param_spec_string (
@@ -244,11 +236,7 @@ gabble_olpc_activity_class_init (
"activity id",
"the activity ID",
NULL,
- G_PARAM_CONSTRUCT |
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_ID, param_spec);
param_spec = g_param_spec_boxed (
@@ -256,11 +244,7 @@ gabble_olpc_activity_class_init (
"activity properties",
"a GHashTable containing activity's properties",
G_TYPE_HASH_TABLE,
- G_PARAM_CONSTRUCT |
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_PROPERTIES, param_spec);
}
diff --git a/src/olpc-buddy-view.c b/src/olpc-buddy-view.c
index 60e0adc..e5e93d9 100644
--- a/src/olpc-buddy-view.c
+++ b/src/olpc-buddy-view.c
@@ -363,16 +363,14 @@ gabble_olpc_buddy_view_class_init (
"View's search properties",
"The buddy properties Gadget should look for",
TP_HASH_TYPE_STRING_VARIANT_MAP,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_VIEW_PROPERTIES,
param_spec);
param_spec = g_param_spec_string ("alias", "View's search alias",
"The buddy alias Gadget should look for",
NULL,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_ALIAS,
param_spec);
diff --git a/src/olpc-view.c b/src/olpc-view.c
index db9eb41..5d0d24e 100644
--- a/src/olpc-view.c
+++ b/src/olpc-view.c
@@ -413,37 +413,32 @@ gabble_olpc_view_class_init (GabbleOlpcViewClass *gabble_olpc_view_class)
param_spec = g_param_spec_boxed ("interfaces", "Extra D-Bus interfaces",
"Additional Channel.Interface.* interfaces",
G_TYPE_STRV,
- 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_INTERFACES, param_spec);
param_spec = g_param_spec_string ("target-id", "Peer's bare JID",
"The string obtained by inspecting the peer handle (never the full JID)",
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_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);
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);
@@ -451,39 +446,34 @@ gabble_olpc_view_class_init (GabbleOlpcViewClass *gabble_olpc_view_class)
"The maximum number of elements that Gadget has to return to the "
"search request.",
0, G_MAXUINT32, 0,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_MAX_SIZE,
param_spec);
param_spec = g_param_spec_boxed ("buddies", "View's buddies",
"The contact handles of the buddies who are in this view channel",
GABBLE_ARRAY_TYPE_HANDLE,
- 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_BUDDIES,
param_spec);
param_spec = g_param_spec_boxed ("activities", "View's activities",
"The activities which are in this view channel",
GABBLE_ARRAY_TYPE_ACTIVITY_LIST,
- 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_ACTIVITIES,
param_spec);
param_spec = g_param_spec_object ("connection", "GabbleConnection object",
"Gabble connection object that owns this view 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_class_install_property (object_class, PROP_CONNECTION, param_spec);
param_spec = g_param_spec_uint ("id", "query ID",
"The ID of the query associated with this view",
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_class_install_property (object_class, PROP_ID, param_spec);
signals[BUDDY_ACTIVITIES_CHANGED] =
--
1.5.6.5
More information about the Telepathy-commits
mailing list