[Telepathy-commits] [telepathy-gabble/master] GabbleBytestream*: use G_PARAM_STATIC_STRINGS

[Simon McVittie]

---
 src/bytestream-factory.c |    6 +-----
 src/bytestream-ibb.c     |   17 +++--------------
 src/bytestream-iface.c   |   37 +++++++------------------------------
 3 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index fd382e1..47d3e78 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -285,11 +285,7 @@ gabble_bytestream_factory_class_init (
       "GabbleConnection object",
       "Gabble connection object that owns this bytestream factory 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);
 }
 
diff --git a/src/bytestream-ibb.c b/src/bytestream-ibb.c
index e140d2f..7ae1b48 100644
--- a/src/bytestream-ibb.c
+++ b/src/bytestream-ibb.c
@@ -300,11 +300,7 @@ gabble_bytestream_ibb_class_init (
       "Peer resource",
       "the resource used by the remote peer during the SI, if any",
       NULL,
-      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_PEER_RESOURCE,
       param_spec);
 
@@ -313,10 +309,7 @@ gabble_bytestream_ibb_class_init (
       "stream init ID",
       "the iq ID of the SI request, if any",
       NULL,
-      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_STREAM_INIT_ID,
       param_spec);
 
@@ -325,11 +318,7 @@ gabble_bytestream_ibb_class_init (
       "block size",
       "Maximum data sent using one stanza as described in XEP-0047",
       0, G_MAXUINT32, 4096,
-      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_BLOCK_SIZE,
       param_spec);
 
diff --git a/src/bytestream-iface.c b/src/bytestream-iface.c
index dc9b862..72e0381 100644
--- a/src/bytestream-iface.c
+++ b/src/bytestream-iface.c
@@ -78,11 +78,7 @@ gabble_bytestream_iface_base_init (gpointer klass)
           "GabbleConnection object",
           "Gabble connection object that owns this Bytestream 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 (
@@ -90,11 +86,7 @@ gabble_bytestream_iface_base_init (gpointer klass)
           "Peer handle",
           "The TpHandle of the remote peer involved in this bytestream",
           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 (
@@ -102,10 +94,7 @@ gabble_bytestream_iface_base_init (gpointer klass)
           "Peer handle type",
           "The TpHandleType of the remote peer's associated handle",
           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 (
@@ -113,11 +102,7 @@ gabble_bytestream_iface_base_init (gpointer klass)
           "stream ID",
           "the ID of the stream",
           "",
-          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_string (
@@ -126,9 +111,7 @@ gabble_bytestream_iface_base_init (gpointer klass)
           "The JID used by the remote peer during the SI",
           "",
           G_PARAM_READABLE |
-          G_PARAM_STATIC_NAME |
-          G_PARAM_STATIC_NICK |
-          G_PARAM_STATIC_BLURB);
+          G_PARAM_STATIC_STRINGS);
       g_object_interface_install_property (klass, param_spec);
 
       param_spec = g_param_spec_uint (
@@ -138,10 +121,7 @@ gabble_bytestream_iface_base_init (gpointer klass)
           "this bytestream object",
           0, NUM_GABBLE_BYTESTREAM_STATES - 1,
           GABBLE_BYTESTREAM_STATE_LOCAL_PENDING,
-          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_string (
@@ -149,10 +129,7 @@ gabble_bytestream_iface_base_init (gpointer klass)
           "protocol",
           "the name of the protocol implemented by this bytestream",
           NULL,
-          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;
-- 
1.5.6.5