[telepathy-gabble/master] Use G_PARAM_STATIC_STRINGS where applicable

Sjoerd Simons sjoerd.simons at collabora.co.uk
Wed Dec 23 16:01:08 PST 2009


---
 src/call-content.c         |   15 +++------------
 src/call-stream-endpoint.c |   14 +++-----------
 src/call-stream.c          |   10 ++--------
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/src/call-content.c b/src/call-content.c
index 016f14b..e5edf30 100644
--- a/src/call-content.c
+++ b/src/call-content.c
@@ -310,29 +310,20 @@ gabble_call_content_class_init (
       "The D-Bus object path used for this "
       "object on the bus.",
       NULL,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_OBJECT_PATH, param_spec);
 
   param_spec = g_param_spec_object ("jingle-content", "Jingle Content",
       "The Jingle Content related to this content object",
       GABBLE_TYPE_JINGLE_CONTENT,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_JINGLE_CONTENT,
       param_spec);
 
   param_spec = g_param_spec_uint ("target-handle", "Target Handle",
       "Target handle of the call channel",
       0, G_MAXUINT, 0,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_TARGET_HANDLE,
       param_spec);
 
diff --git a/src/call-stream-endpoint.c b/src/call-stream-endpoint.c
index 8381568..97b0890 100644
--- a/src/call-stream-endpoint.c
+++ b/src/call-stream-endpoint.c
@@ -238,19 +238,13 @@ gabble_call_stream_endpoint_class_init (
       "The D-Bus object path used for this "
       "object on the bus.",
       NULL,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_OBJECT_PATH, param_spec);
 
   param_spec = g_param_spec_object ("jingle-content", "Jingle Content",
       "The Jingle Content related to this content object",
       GABBLE_TYPE_JINGLE_CONTENT,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_JINGLE_CONTENT,
       param_spec);
 
@@ -274,9 +268,7 @@ gabble_call_stream_endpoint_class_init (
       "The stream state of this endpoint.",
       0, G_MAXUINT32,
       TP_MEDIA_STREAM_STATE_DISCONNECTED,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_STREAM_STATE,
       param_spec);
 
diff --git a/src/call-stream.c b/src/call-stream.c
index 614de04..34b8871 100644
--- a/src/call-stream.c
+++ b/src/call-stream.c
@@ -376,19 +376,13 @@ gabble_call_stream_class_init (GabbleCallStreamClass *gabble_call_stream_class)
       "The D-Bus object path used for this "
       "object on the bus.",
       NULL,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_OBJECT_PATH, param_spec);
 
   param_spec = g_param_spec_object ("jingle-content", "Jingle Content",
       "The Jingle Content related to this content object",
       GABBLE_TYPE_JINGLE_CONTENT,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_JINGLE_CONTENT,
       param_spec);
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list