[telepathy-gabble/master] Use G_PARAM_STATIC_STRINGS in JingleContent/MediaRtp

[Will Thompson]

---
 src/jingle-content.c   |   80 ++++++++++++++++-------------------------------
 src/jingle-media-rtp.c |    3 +-
 2 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/src/jingle-content.c b/src/jingle-content.c
index ef560f9..49e12c0 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -282,83 +282,57 @@ gabble_jingle_content_class_init (GabbleJingleContentClass *cls)
 
   /* property definitions */
   param_spec = g_param_spec_object ("connection", "GabbleConnection object",
-                                    "Gabble connection object used for exchanging "
-                                    "messages.",
-                                    GABBLE_TYPE_CONNECTION,
-                                    G_PARAM_CONSTRUCT_ONLY |
-                                    G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NICK |
-                                    G_PARAM_STATIC_BLURB);
+      "Gabble connection object used for exchanging messages.",
+      GABBLE_TYPE_CONNECTION,
+      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_object ("session", "GabbleJingleSession object",
-                                    "Jingle session object that owns this content.",
-                                    GABBLE_TYPE_JINGLE_SESSION,
-                                    G_PARAM_CONSTRUCT_ONLY |
-                                    G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NICK |
-                                    G_PARAM_STATIC_BLURB);
+      "Jingle session object that owns this content.",
+      GABBLE_TYPE_JINGLE_SESSION,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_SESSION, param_spec);
 
   param_spec = g_param_spec_string ("name", "Content name",
-                                    "A unique content name in the session.",
-                                    NULL,
-                                    G_PARAM_CONSTRUCT_ONLY |
-                                    G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NAME |
-                                    G_PARAM_STATIC_BLURB);
+      "A unique content name in the session.",
+      NULL,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_NAME, param_spec);
 
   param_spec = g_param_spec_string ("content-ns", "Content namespace",
-                                    "Namespace identifying the content type.",
-                                    NULL,
-                                    G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NAME |
-                                    G_PARAM_STATIC_BLURB);
+      "Namespace identifying the content type.",
+      NULL,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONTENT_NS, param_spec);
 
   param_spec = g_param_spec_string ("transport-ns", "Transport namespace",
-                                    "Namespace identifying the transport type.",
-                                    NULL,
-                                    G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NAME |
-                                    G_PARAM_STATIC_BLURB);
+      "Namespace identifying the transport type.",
+      NULL,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_TRANSPORT_NS, param_spec);
 
-
-
   param_spec = g_param_spec_uint ("senders", "Stream senders",
-                                  "Valid senders for the stream.",
-                                  0, G_MAXUINT32, JINGLE_CONTENT_SENDERS_NONE,
-                                  G_PARAM_READWRITE |
-                                  G_PARAM_STATIC_NAME |
-                                  G_PARAM_STATIC_BLURB);
+      "Valid senders for the stream.",
+      0, G_MAXUINT32, JINGLE_CONTENT_SENDERS_NONE,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_SENDERS, param_spec);
 
   param_spec = g_param_spec_uint ("state", "Content state",
-                                  "The current state that the content is in.",
-                                  0, G_MAXUINT32, JINGLE_CONTENT_STATE_EMPTY,
-                                  G_PARAM_READWRITE |
-                                  G_PARAM_STATIC_NAME |
-                                  G_PARAM_STATIC_BLURB);
+      "The current state that the content is in.",
+      0, G_MAXUINT32, JINGLE_CONTENT_STATE_EMPTY,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_STATE, param_spec);
 
   param_spec = g_param_spec_string ("disposition", "Content disposition",
-                                    "Distinguishes between 'session' and other "
-                                    "contents.",
-                                    NULL,
-                                    G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NAME |
-                                    G_PARAM_STATIC_BLURB);
+      "Distinguishes between 'session' and other contents.",
+      NULL,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_DISPOSITION, param_spec);
 
   param_spec = g_param_spec_boolean ("locally-created", "Locally created",
-                                     "True if the content was created by the "
-                                     "local client.",
-                                     FALSE,
-                                     G_PARAM_READABLE |
-                                     G_PARAM_STATIC_NAME |
-                                     G_PARAM_STATIC_BLURB);
+      "True if the content was created by the local client.",
+      FALSE,
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_LOCALLY_CREATED, param_spec);
 
   /* signal definitions */
diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index e03f04e..7877a07 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -244,8 +244,7 @@ gabble_jingle_media_rtp_class_init (GabbleJingleMediaRtpClass *cls)
   param_spec = g_param_spec_uint ("media-type", "RTP media type",
       "Media type.",
       JINGLE_MEDIA_TYPE_NONE, G_MAXUINT32, JINGLE_MEDIA_TYPE_NONE,
-      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_MEDIA_TYPE, param_spec);
 
   param_spec = g_param_spec_boolean ("remote-mute", "Remote mute",
-- 
1.5.6.5