[Telepathy-commits] [telepathy-salut/master] Gibber: use G_PARAM_STATIC_STRINGS

Alban Crequy alban.crequy at collabora.co.uk
Sun Nov 9 13:51:18 PST 2008


---
 lib/gibber/gibber-bytestream-ibb.c               |   10 +-------
 lib/gibber/gibber-bytestream-iface.c             |   25 ++++-----------------
 lib/gibber/gibber-bytestream-muc.c               |    6 +----
 lib/gibber/gibber-bytestream-oob.c               |   15 ++----------
 lib/gibber/gibber-iq-helper.c                    |    5 +---
 lib/gibber/gibber-r-multicast-causal-transport.c |    6 +---
 lib/gibber/gibber-r-multicast-sender.c           |    4 +--
 lib/gibber/gibber-r-multicast-transport.c        |    4 +--
 8 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/lib/gibber/gibber-bytestream-ibb.c b/lib/gibber/gibber-bytestream-ibb.c
index 4c7e2ea..bab80c9 100644
--- a/lib/gibber/gibber-bytestream-ibb.c
+++ b/lib/gibber/gibber-bytestream-ibb.c
@@ -323,10 +323,7 @@ gibber_bytestream_ibb_class_init (
       "bytestream if it's a private one",
       GIBBER_TYPE_XMPP_CONNECTION,
       G_PARAM_CONSTRUCT_ONLY |
-      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_XMPP_CONNECTION,
       param_spec);
 
@@ -336,10 +333,7 @@ gibber_bytestream_ibb_class_init (
       "the iq ID of the SI request, if any",
       "",
       G_PARAM_CONSTRUCT_ONLY |
-      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);
 
diff --git a/lib/gibber/gibber-bytestream-iface.c b/lib/gibber/gibber-bytestream-iface.c
index d926b05..7fd507d 100644
--- a/lib/gibber/gibber-bytestream-iface.c
+++ b/lib/gibber/gibber-bytestream-iface.c
@@ -78,10 +78,7 @@ gibber_bytestream_iface_base_init (gpointer klass)
           "the ID of the local user",
           "",
           G_PARAM_CONSTRUCT_ONLY |
-          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 (
@@ -91,10 +88,7 @@ gibber_bytestream_iface_base_init (gpointer klass)
           "bytestream",
           "",
           G_PARAM_CONSTRUCT_ONLY |
-          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 (
@@ -103,10 +97,7 @@ gibber_bytestream_iface_base_init (gpointer klass)
           "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_READWRITE | G_PARAM_STATIC_STRINGS);
       g_object_interface_install_property (klass, param_spec);
 
       param_spec = g_param_spec_uint (
@@ -116,10 +107,7 @@ gibber_bytestream_iface_base_init (gpointer klass)
           "this bytestream object",
           0, NUM_GIBBER_BYTESTREAM_STATES - 1,
           GIBBER_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 (
@@ -127,10 +115,7 @@ gibber_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;
diff --git a/lib/gibber/gibber-bytestream-muc.c b/lib/gibber/gibber-bytestream-muc.c
index 6d039a2..b4bfbc4 100644
--- a/lib/gibber/gibber-bytestream-muc.c
+++ b/lib/gibber/gibber-bytestream-muc.c
@@ -317,11 +317,7 @@ gibber_bytestream_muc_class_init (
       "Gibber MUC connection object used for communication by this "
       "bytestream if it's a muc one",
       GIBBER_TYPE_MUC_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_MUC_CONNECTION,
       param_spec);
 
diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c
index 0002237..593c382 100644
--- a/lib/gibber/gibber-bytestream-oob.c
+++ b/lib/gibber/gibber-bytestream-oob.c
@@ -640,10 +640,7 @@ gibber_bytestream_oob_class_init (
       "bytestream if it's a private one",
       GIBBER_TYPE_XMPP_CONNECTION,
       G_PARAM_CONSTRUCT_ONLY |
-      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_XMPP_CONNECTION,
       param_spec);
 
@@ -653,10 +650,7 @@ gibber_bytestream_oob_class_init (
       "the iq ID of the SI request, if any",
       "",
       G_PARAM_CONSTRUCT_ONLY |
-      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);
 
@@ -666,10 +660,7 @@ gibber_bytestream_oob_class_init (
       "The hostname to use in the OOB URL. Literal are not allowed",
       "",
       G_PARAM_CONSTRUCT_ONLY |
-      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_HOST,
       param_spec);
 
diff --git a/lib/gibber/gibber-iq-helper.c b/lib/gibber/gibber-iq-helper.c
index 454dbbc..3fef885 100644
--- a/lib/gibber/gibber-iq-helper.c
+++ b/lib/gibber/gibber-iq-helper.c
@@ -216,10 +216,7 @@ gibber_iq_helper_class_init (GibberIqHelperClass *gibber_iq_helper_class)
       "GibberXmppConnection object",
       "Gibber XMPP Connection associated with this GibberIqHelper object",
       GIBBER_TYPE_XMPP_CONNECTION,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      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_XMPP_CONNECTION,
       param_spec);
 }
diff --git a/lib/gibber/gibber-r-multicast-causal-transport.c b/lib/gibber/gibber-r-multicast-causal-transport.c
index 5f34dec..106ef24 100644
--- a/lib/gibber/gibber-r-multicast-causal-transport.c
+++ b/lib/gibber/gibber-r-multicast-causal-transport.c
@@ -250,14 +250,12 @@ gibber_r_multicast_causal_transport_class_init (
 
   param_spec = g_param_spec_object ("transport", "transport",
       "The underlying Transport", GIBBER_TYPE_TRANSPORT,
-      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_TRANSPORT, param_spec);
 
   param_spec = g_param_spec_string ("name", "name",
       "The name to use on the protocol", 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_NAME, param_spec);
 
   transport_class->send = gibber_r_multicast_causal_transport_do_send;
diff --git a/lib/gibber/gibber-r-multicast-sender.c b/lib/gibber/gibber-r-multicast-sender.c
index f8946ba..eb7943a 100644
--- a/lib/gibber/gibber-r-multicast-sender.c
+++ b/lib/gibber/gibber-r-multicast-sender.c
@@ -773,9 +773,7 @@ gibber_r_multicast_sender_class_init (
       "Sender Group",
       "Group of senders",
       G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_WRITABLE       |
-      G_PARAM_STATIC_NAME    |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_WRITABLE       | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_property (object_class, PROP_SENDER_GROUP,
       param_spec);
diff --git a/lib/gibber/gibber-r-multicast-transport.c b/lib/gibber/gibber-r-multicast-transport.c
index a4ac7d8..2e7d884 100644
--- a/lib/gibber/gibber-r-multicast-transport.c
+++ b/lib/gibber/gibber-r-multicast-transport.c
@@ -267,9 +267,7 @@ gibber_r_multicast_transport_class_init (
      "transport", "The underlying Transport",
       GIBBER_TYPE_TRANSPORT,
       G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE      |
-      G_PARAM_STATIC_NAME    |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READWRITE      | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_property (object_class, PROP_TRANSPORT,
                                   param_spec);
-- 
1.5.6.5



More information about the Telepathy-commits mailing list