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

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


---
 src/salut-avahi-contact-manager.c       |    5 +--
 src/salut-avahi-contact.c               |    5 +--
 src/salut-avahi-muc-channel.c           |    5 +--
 src/salut-avahi-muc-manager.c           |    5 +--
 src/salut-avahi-olpc-activity-manager.c |    5 +--
 src/salut-avahi-olpc-activity.c         |    5 +--
 src/salut-avahi-self.c                  |    5 +--
 src/salut-bytestream-manager.c          |   10 +-----
 src/salut-connection-manager.c          |    5 +--
 src/salut-connection.c                  |   45 ++++++++-------------------
 src/salut-contact-channel.c             |    7 +---
 src/salut-contact-manager.c             |    5 +--
 src/salut-contact.c                     |   10 +-----
 src/salut-discovery-client.c            |    5 +--
 src/salut-im-manager.c                  |   15 ++-------
 src/salut-muc-channel.c                 |   18 ++++-------
 src/salut-muc-manager.c                 |   10 +-----
 src/salut-olpc-activity-manager.c       |    5 +--
 src/salut-olpc-activity.c               |    5 +--
 src/salut-roomlist-channel.c            |    3 +-
 src/salut-self.c                        |   45 +++++----------------------
 src/salut-tubes-channel.c               |   14 ++-------
 src/salut-xmpp-connection-manager.c     |    8 +----
 src/tube-dbus.c                         |   30 ++++---------------
 src/tube-iface.c                        |   50 ++++++------------------------
 src/tube-stream.c                       |   20 ++----------
 26 files changed, 78 insertions(+), 267 deletions(-)

diff --git a/src/salut-avahi-contact-manager.c b/src/salut-avahi-contact-manager.c
index af93efe..3e30631 100644
--- a/src/salut-avahi-contact-manager.c
+++ b/src/salut-avahi-contact-manager.c
@@ -285,10 +285,7 @@ salut_avahi_contact_manager_class_init (
       "The Salut Avahi Discovery client associated with this muc channel",
       SALUT_TYPE_AVAHI_DISCOVERY_CLIENT,
       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_DISCOVERY_CLIENT,
       param_spec);
 }
diff --git a/src/salut-avahi-contact.c b/src/salut-avahi-contact.c
index 10b1723..d9f8401 100644
--- a/src/salut-avahi-contact.c
+++ b/src/salut-avahi-contact.c
@@ -384,10 +384,7 @@ salut_avahi_contact_class_init (
       "The Salut Avahi Discovery client associated with this muc manager",
       SALUT_TYPE_AVAHI_DISCOVERY_CLIENT,
       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_CLIENT,
       param_spec);
 }
diff --git a/src/salut-avahi-muc-channel.c b/src/salut-avahi-muc-channel.c
index 26d868a..0a30cac 100644
--- a/src/salut-avahi-muc-channel.c
+++ b/src/salut-avahi-muc-channel.c
@@ -298,10 +298,7 @@ salut_avahi_muc_channel_class_init (
       "The Salut Avahi Discovery client associated with this muc channel",
       SALUT_TYPE_AVAHI_DISCOVERY_CLIENT,
       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_DISCOVERY_CLIENT,
       param_spec);
 
diff --git a/src/salut-avahi-muc-manager.c b/src/salut-avahi-muc-manager.c
index 3a1a9a4..02d06bf 100644
--- a/src/salut-avahi-muc-manager.c
+++ b/src/salut-avahi-muc-manager.c
@@ -398,10 +398,7 @@ salut_avahi_muc_manager_class_init (
       "The Salut Avahi Discovery client associated with this muc manager",
       SALUT_TYPE_AVAHI_DISCOVERY_CLIENT,
       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_CLIENT,
       param_spec);
 }
diff --git a/src/salut-avahi-olpc-activity-manager.c b/src/salut-avahi-olpc-activity-manager.c
index 94fd0a1..45c4a11 100644
--- a/src/salut-avahi-olpc-activity-manager.c
+++ b/src/salut-avahi-olpc-activity-manager.c
@@ -334,10 +334,7 @@ salut_avahi_olpc_activity_manager_class_init (SalutAvahiOlpcActivityManagerClass
       "The Salut Avahi Discovery client associated with this manager",
       SALUT_TYPE_AVAHI_DISCOVERY_CLIENT,
       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_CLIENT,
       param_spec);
 }
diff --git a/src/salut-avahi-olpc-activity.c b/src/salut-avahi-olpc-activity.c
index adaaeb6..2a3681a 100644
--- a/src/salut-avahi-olpc-activity.c
+++ b/src/salut-avahi-olpc-activity.c
@@ -274,10 +274,7 @@ salut_avahi_olpc_activity_class_init (
       "The Salut Avahi Discovery client associated with this manager",
       SALUT_TYPE_AVAHI_DISCOVERY_CLIENT,
       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_CLIENT,
       param_spec);
 }
diff --git a/src/salut-avahi-self.c b/src/salut-avahi-self.c
index 3cd64e4..2aa99b3 100644
--- a/src/salut-avahi-self.c
+++ b/src/salut-avahi-self.c
@@ -455,10 +455,7 @@ salut_avahi_self_class_init (
       "The Salut Avahi Discovery client associated with this self object",
       SALUT_TYPE_AVAHI_DISCOVERY_CLIENT,
       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_DISCOVERY_CLIENT,
       param_spec);
 }
diff --git a/src/salut-bytestream-manager.c b/src/salut-bytestream-manager.c
index 6b0f117..de32994 100644
--- a/src/salut-bytestream-manager.c
+++ b/src/salut-bytestream-manager.c
@@ -566,10 +566,7 @@ salut_bytestream_manager_class_init (
       "Salut Connection that owns the connection for this bytestream channel",
       SALUT_TYPE_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_CONNECTION, param_spec);
 
   param_spec = g_param_spec_string (
@@ -578,10 +575,7 @@ salut_bytestream_manager_class_init (
       "The FQDN host name that will be used by OOB bytestreams",
       NULL,
       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_NAME_FQDN,
       param_spec);
 }
diff --git a/src/salut-connection-manager.c b/src/salut-connection-manager.c
index 4aea6b5..612d6b4 100644
--- a/src/salut-connection-manager.c
+++ b/src/salut-connection-manager.c
@@ -177,10 +177,7 @@ salut_connection_manager_class_init (
       "backend type",
       "a G_TYPE_GTYPE of the backend to use",
       G_TYPE_NONE,
-      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_BACKEND,
       param_spec);
 
diff --git a/src/salut-connection.c b/src/salut-connection.c
index 9b45913..381fe24 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -644,32 +644,32 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
 
   param_spec = g_param_spec_string ("nickname", "nickname",
       "Nickname used in the published data", NULL,
-      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_NICKNAME, param_spec);
 
   param_spec = g_param_spec_string ("first-name", "First name",
       "First name used in the published data", NULL,
-      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_FIRST_NAME, param_spec);
 
   param_spec = g_param_spec_string ("last-name", "Last name",
       "Last name used in the published data", NULL,
-      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_LAST_NAME, param_spec);
 
   param_spec = g_param_spec_string ("email", "E-mail address",
       "E-mail address used in the published data", NULL,
-      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_EMAIL, param_spec);
 
   param_spec = g_param_spec_string ("jid", "Jabber id",
       "Jabber id used in the published data", NULL,
-      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_JID, param_spec);
 
   param_spec = g_param_spec_string ("published-name", "Published name",
       "Username used in the published data", NULL,
-      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_PUBLISHED_NAME,
       param_spec);
 
@@ -678,9 +678,7 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
       "SalutImManager object",
       "The Salut IM Manager associated with this Salut Connection",
       SALUT_TYPE_IM_MANAGER,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_IM_MANAGER,
       param_spec);
 
@@ -689,9 +687,7 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
       "SalutMucManager object",
       "The Salut MUC Manager associated with this Salut Connection",
       SALUT_TYPE_MUC_MANAGER,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_MUC_MANAGER,
       param_spec);
 
@@ -700,9 +696,7 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
       "SalutContactManager object",
       "The Salut Contact Manager associated with this Salut Connection",
       SALUT_TYPE_CONTACT_MANAGER,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONTACT_MANAGER,
       param_spec);
 
@@ -711,9 +705,7 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
       "SalutSelf object",
       "The Salut Self object associated with this Salut Connection",
       SALUT_TYPE_SELF,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_SELF,
       param_spec);
 
@@ -723,9 +715,7 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
       "The Salut XMPP Connection Manager associated with this Salut "
       "Connection",
       SALUT_TYPE_XMPP_CONNECTION_MANAGER,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_XCM,
       param_spec);
 
@@ -734,9 +724,7 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
       "SalutBytestreamManager object",
       "The Salut Bytestream Manager associated with this Salut Connection",
       SALUT_TYPE_BYTESTREAM_MANAGER,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_BYTESTREAM_MANAGER,
       param_spec);
 
@@ -746,9 +734,7 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
       "SalutOlpcActivityManager object",
       "The OLPC activity Manager associated with this Salut Connection",
       SALUT_TYPE_OLPC_ACTIVITY_MANAGER,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_OLPC_ACTIVITY_MANAGER,
       param_spec);
 #endif
@@ -759,10 +745,7 @@ salut_connection_class_init (SalutConnectionClass *salut_connection_class)
       "a G_TYPE_GTYPE of the backend to use",
       G_TYPE_NONE,
       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_BACKEND,
       param_spec);
 
diff --git a/src/salut-contact-channel.c b/src/salut-contact-channel.c
index 299fc67..b59f548 100644
--- a/src/salut-contact-channel.c
+++ b/src/salut-contact-channel.c
@@ -284,9 +284,7 @@ salut_contact_channel_class_init (SalutContactChannelClass *salut_contact_channe
                                     SALUT_TYPE_CONNECTION,
                                     G_PARAM_CONSTRUCT_ONLY |
                                     G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NAME |
-                                    G_PARAM_STATIC_NICK |
-                                    G_PARAM_STATIC_BLURB);
+                                    G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONNECTION, param_spec);
 
   param_spec = g_param_spec_boxed ("interfaces", "Extra D-Bus interfaces",
@@ -311,8 +309,7 @@ salut_contact_channel_class_init (SalutContactChannelClass *salut_contact_channe
   param_spec = g_param_spec_string ("target-id", "Target JID",
       "The string obtained by inspecting this channel's handle",
       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_class_install_property (object_class, PROP_TARGET_ID, param_spec);
 
   param_spec = g_param_spec_boolean ("requested", "Requested?",
diff --git a/src/salut-contact-manager.c b/src/salut-contact-manager.c
index 0b7556f..4cd9cbe 100644
--- a/src/salut-contact-manager.c
+++ b/src/salut-contact-manager.c
@@ -155,10 +155,7 @@ salut_contact_manager_class_init (SalutContactManagerClass *salut_contact_manage
       "The Salut Connection associated with this contact manager",
       SALUT_TYPE_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_CONNECTION,
       param_spec);
 
diff --git a/src/salut-contact.c b/src/salut-contact.c
index dd96b22..1a91a93 100644
--- a/src/salut-contact.c
+++ b/src/salut-contact.c
@@ -225,10 +225,7 @@ salut_contact_class_init (SalutContactClass *salut_contact_class)
       "The Salut Connection associated with this contact",
       SALUT_TYPE_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_CONNECTION,
       param_spec);
 
@@ -238,10 +235,7 @@ salut_contact_class_init (SalutContactClass *salut_contact_class)
       "The name of this contact",
       NULL,
       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_NAME,
       param_spec);
 }
diff --git a/src/salut-discovery-client.c b/src/salut-discovery-client.c
index db32ad8..5663f12 100644
--- a/src/salut-discovery-client.c
+++ b/src/salut-discovery-client.c
@@ -115,10 +115,7 @@ salut_discovery_client_base_init (gpointer klass)
           " this client object",
           0, NUM_SALUT_DISCOVERY_CLIENT_STATE - 1,
           SALUT_DISCOVERY_CLIENT_STATE_DISCONNECTED,
-          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/src/salut-im-manager.c b/src/salut-im-manager.c
index 42f5791..c42d7ac 100644
--- a/src/salut-im-manager.c
+++ b/src/salut-im-manager.c
@@ -286,10 +286,7 @@ salut_im_manager_class_init (SalutImManagerClass *salut_im_manager_class)
       "Salut connection object that owns this text channel factory object.",
       SALUT_TYPE_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_CONNECTION, param_spec);
 
   param_spec = g_param_spec_object (
@@ -299,10 +296,7 @@ salut_im_manager_class_init (SalutImManagerClass *salut_im_manager_class)
       "manager",
       SALUT_TYPE_CONTACT_MANAGER,
       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_CONTACT_MANAGER,
       param_spec);
 
@@ -313,10 +307,7 @@ salut_im_manager_class_init (SalutImManagerClass *salut_im_manager_class)
       "of this manager",
       SALUT_TYPE_XMPP_CONNECTION_MANAGER,
       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_MANAGER,
       param_spec);
 }
diff --git a/src/salut-muc-channel.c b/src/salut-muc-channel.c
index cc3688b..83142b1 100644
--- a/src/salut-muc-channel.c
+++ b/src/salut-muc-channel.c
@@ -773,8 +773,7 @@ salut_muc_channel_class_init (SalutMucChannelClass *salut_muc_channel_class) {
   param_spec = g_param_spec_string ("target-id", "Target JID",
       "The string obtained by inspecting this channel's handle",
       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_class_install_property (object_class, PROP_TARGET_ID, param_spec);
 
   param_spec = g_param_spec_boolean ("requested", "Requested?",
@@ -804,8 +803,7 @@ salut_muc_channel_class_init (SalutMucChannelClass *salut_muc_channel_class) {
                                     NULL,
                                     G_PARAM_CONSTRUCT_ONLY |
                                     G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NICK |
-                                    G_PARAM_STATIC_BLURB);
+                                    G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class,
                                    PROP_NAME, param_spec);
 
@@ -815,8 +813,7 @@ salut_muc_channel_class_init (SalutMucChannelClass *salut_muc_channel_class) {
                                     GIBBER_TYPE_MUC_CONNECTION,
                                     G_PARAM_CONSTRUCT_ONLY |
                                     G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NICK |
-                                    G_PARAM_STATIC_BLURB);
+                                    G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class,
                                    PROP_MUC_CONNECTION, param_spec);
   param_spec = g_param_spec_object ("connection",
@@ -826,8 +823,7 @@ salut_muc_channel_class_init (SalutMucChannelClass *salut_muc_channel_class) {
                                     SALUT_TYPE_CONNECTION,
                                     G_PARAM_CONSTRUCT_ONLY |
                                     G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NICK |
-                                    G_PARAM_STATIC_BLURB);
+                                    G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class,
                                    PROP_CONNECTION, param_spec);
 
@@ -838,8 +834,7 @@ salut_muc_channel_class_init (SalutMucChannelClass *salut_muc_channel_class) {
       SALUT_TYPE_XMPP_CONNECTION_MANAGER,
       G_PARAM_CONSTRUCT_ONLY |
       G_PARAM_READWRITE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_XMPP_CONNECTION_MANAGER,
       param_spec);
 
@@ -850,8 +845,7 @@ salut_muc_channel_class_init (SalutMucChannelClass *salut_muc_channel_class) {
       FALSE,
       G_PARAM_CONSTRUCT_ONLY |
       G_PARAM_READWRITE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class,
       PROP_CREATOR, param_spec);
 
diff --git a/src/salut-muc-manager.c b/src/salut-muc-manager.c
index 48cf390..f32f38d 100644
--- a/src/salut-muc-manager.c
+++ b/src/salut-muc-manager.c
@@ -197,10 +197,7 @@ salut_muc_manager_class_init (SalutMucManagerClass *salut_muc_manager_class)
       "The Salut Connection associated with this muc manager",
       SALUT_TYPE_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_CONNECTION,
       param_spec);
 
@@ -211,10 +208,7 @@ salut_muc_manager_class_init (SalutMucManagerClass *salut_muc_manager_class)
       "manager",
       SALUT_TYPE_XMPP_CONNECTION_MANAGER,
       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_XCM,
       param_spec);
 }
diff --git a/src/salut-olpc-activity-manager.c b/src/salut-olpc-activity-manager.c
index 2f83414..eb25b09 100644
--- a/src/salut-olpc-activity-manager.c
+++ b/src/salut-olpc-activity-manager.c
@@ -134,10 +134,7 @@ salut_olpc_activity_manager_class_init (SalutOlpcActivityManagerClass *salut_olp
       "The Salut Connection associated with this muc manager",
       SALUT_TYPE_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_CONNECTION,
       param_spec);
 
diff --git a/src/salut-olpc-activity.c b/src/salut-olpc-activity.c
index d9d9cf7..98bcde2 100644
--- a/src/salut-olpc-activity.c
+++ b/src/salut-olpc-activity.c
@@ -163,10 +163,7 @@ salut_olpc_activity_class_init (SalutOlpcActivityClass *salut_olpc_activity_clas
       "The Salut Connection associated with this muc manager",
       SALUT_TYPE_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_CONNECTION,
       param_spec);
 
diff --git a/src/salut-roomlist-channel.c b/src/salut-roomlist-channel.c
index 0e11445..957c1dd 100644
--- a/src/salut-roomlist-channel.c
+++ b/src/salut-roomlist-channel.c
@@ -322,8 +322,7 @@ salut_roomlist_channel_class_init (
                                     SALUT_TYPE_CONNECTION,
                                     G_PARAM_CONSTRUCT_ONLY |
                                     G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_NICK |
-                                    G_PARAM_STATIC_BLURB);
+                                    G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONNECTION, param_spec);
 
   salut_roomlist_channel_class->dbus_props_class.interfaces = prop_interfaces;
diff --git a/src/salut-self.c b/src/salut-self.c
index 3e1cfe8..a1e3388 100644
--- a/src/salut-self.c
+++ b/src/salut-self.c
@@ -326,10 +326,7 @@ salut_self_class_init (SalutSelfClass *salut_self_class)
       "The Salut Connection associated with this self object",
       SALUT_TYPE_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_CONNECTION,
       param_spec);
 
@@ -339,10 +336,7 @@ salut_self_class_init (SalutSelfClass *salut_self_class)
       "The nickname of the self user",
       NULL,
       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_NICKNAME,
       param_spec);
 
@@ -352,10 +346,7 @@ salut_self_class_init (SalutSelfClass *salut_self_class)
       "The first name of the self user",
       NULL,
       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_FIRST_NAME,
       param_spec);
 
@@ -365,10 +356,7 @@ salut_self_class_init (SalutSelfClass *salut_self_class)
       "The last name of the self user",
       NULL,
       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_LAST_NAME,
       param_spec);
 
@@ -378,10 +366,7 @@ salut_self_class_init (SalutSelfClass *salut_self_class)
       "The jabber ID of the self user",
       NULL,
       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_JID,
       param_spec);
 
@@ -391,10 +376,7 @@ salut_self_class_init (SalutSelfClass *salut_self_class)
       "The email of the self user",
       NULL,
       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_EMAIL,
       param_spec);
 
@@ -404,10 +386,7 @@ salut_self_class_init (SalutSelfClass *salut_self_class)
       "The name used to publish the presence service",
       g_get_user_name (),
       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_PUBLISHED_NAME,
       param_spec);
 
@@ -417,10 +396,7 @@ salut_self_class_init (SalutSelfClass *salut_self_class)
       "the OLPC key",
       "A pointer to a GArray containing the OLPC key",
       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_OLPC_KEY,
       param_spec);
 
@@ -430,10 +406,7 @@ salut_self_class_init (SalutSelfClass *salut_self_class)
       "The OLPC color of the self user",
       NULL,
       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_OLPC_COLOR,
       param_spec);
 #endif
diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index 5d985c1..0818d31 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -1883,8 +1883,7 @@ salut_tubes_channel_class_init (
   param_spec = g_param_spec_string ("target-id", "Target JID",
       "The string obtained by inspecting this channel's handle",
       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_class_install_property (object_class, PROP_TARGET_ID, param_spec);
 
   param_spec = g_param_spec_boolean ("requested", "Requested?",
@@ -1912,10 +1911,7 @@ salut_tubes_channel_class_init (
       "SalutConnection object",
       "Salut Connection that owns the connection for this tubes channel",
       SALUT_TYPE_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_CONNECTION, param_spec);
 
   param_spec = g_param_spec_object (
@@ -1924,11 +1920,7 @@ salut_tubes_channel_class_init (
       "Salut text MUC channel corresponding to this Tubes channel object, "
       "if the handle type is ROOM.",
       SALUT_TYPE_MUC_CHANNEL,
-      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, param_spec);
 
   param_spec = g_param_spec_boxed ("interfaces", "Extra D-Bus interfaces",
diff --git a/src/salut-xmpp-connection-manager.c b/src/salut-xmpp-connection-manager.c
index 6bd9dad..23f7faf 100644
--- a/src/salut-xmpp-connection-manager.c
+++ b/src/salut-xmpp-connection-manager.c
@@ -1071,9 +1071,7 @@ salut_xmpp_connection_manager_class_init (
       "Salut Connection associated with this manager ",
       SALUT_TYPE_CONNECTION,
       G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONNECTION,
       param_spec);
 
@@ -1084,9 +1082,7 @@ salut_xmpp_connection_manager_class_init (
       "manager",
       SALUT_TYPE_CONTACT_MANAGER,
       G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_CONTACT_MANAGER,
       param_spec);
 
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 5eac42c..3c06251 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -786,10 +786,7 @@ salut_tube_dbus_class_init (SalutTubeDBusClass *salut_tube_dbus_class)
       "tube if it has a HANDLE_TYPE_ROOM handle",
       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_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_MUC_CONNECTION,
       param_spec);
 
@@ -798,10 +795,7 @@ salut_tube_dbus_class_init (SalutTubeDBusClass *salut_tube_dbus_class)
       "Object implementing the GibberBytestreamIface interface",
       "Bytestream object used for streaming data for this D-Bus",
       G_TYPE_OBJECT,
-      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_BYTESTREAM, param_spec);
 
   param_spec = g_param_spec_string (
@@ -809,10 +803,7 @@ salut_tube_dbus_class_init (SalutTubeDBusClass *salut_tube_dbus_class)
       "stream id",
       "The identifier of this tube's bytestream",
       "",
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_STREAM_ID, param_spec);
 
   param_spec = g_param_spec_string (
@@ -820,10 +811,7 @@ salut_tube_dbus_class_init (SalutTubeDBusClass *salut_tube_dbus_class)
       "D-Bus address",
       "The D-Bus address on which this tube will listen for connections",
       "",
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_DBUS_ADDRESS,
       param_spec);
 
@@ -832,10 +820,7 @@ salut_tube_dbus_class_init (SalutTubeDBusClass *salut_tube_dbus_class)
       "D-Bus name",
       "The local D-Bus name on the virtual bus.",
       "",
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_DBUS_NAME, param_spec);
 
   param_spec = g_param_spec_boxed (
@@ -843,10 +828,7 @@ salut_tube_dbus_class_init (SalutTubeDBusClass *salut_tube_dbus_class)
       "D-Bus names",
       "Mapping of contact handles to D-Bus names.",
       G_TYPE_HASH_TABLE,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_DBUS_NAMES, param_spec);
 
   signals[OPENED] =
diff --git a/src/tube-iface.c b/src/tube-iface.c
index 99ed8ff..26bfdf4 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -67,10 +67,7 @@ salut_tube_iface_base_init (gpointer klass)
           "Salut connection object that owns this D-Bus tube object.",
           SALUT_TYPE_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_interface_install_property (klass, param_spec);
 
      param_spec = g_param_spec_uint (
@@ -80,10 +77,7 @@ salut_tube_iface_base_init (gpointer klass)
           "owns this D-Bus tube object.",
           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_READWRITE | G_PARAM_STATIC_STRINGS);
       g_object_interface_install_property (klass, param_spec);
 
       param_spec = g_param_spec_uint (
@@ -93,10 +87,7 @@ salut_tube_iface_base_init (gpointer klass)
           "that owns this D-Bus tube object.",
           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_READWRITE | G_PARAM_STATIC_STRINGS);
       g_object_interface_install_property (klass, param_spec);
 
       param_spec = g_param_spec_uint (
@@ -106,10 +97,7 @@ salut_tube_iface_base_init (gpointer klass)
           "connection's self handle if our handle is a room handle.",
           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_READWRITE | G_PARAM_STATIC_STRINGS);
       g_object_interface_install_property (klass, param_spec);
 
       param_spec = g_param_spec_uint (
@@ -118,10 +106,7 @@ salut_tube_iface_base_init (gpointer klass)
           "The unique identifier of this tube",
           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_READWRITE | G_PARAM_STATIC_STRINGS);
       g_object_interface_install_property (klass, param_spec);
 
       param_spec = g_param_spec_uint (
@@ -129,10 +114,7 @@ salut_tube_iface_base_init (gpointer klass)
           "Tube type",
           "The TpTubeType this D-Bus tube object.",
           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_uint (
@@ -141,10 +123,7 @@ salut_tube_iface_base_init (gpointer klass)
           "The TpHandle of the initiator of this D-Bus tube object.",
           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_READWRITE | G_PARAM_STATIC_STRINGS);
       g_object_interface_install_property (klass, param_spec);
 
       param_spec = g_param_spec_string (
@@ -153,10 +132,7 @@ salut_tube_iface_base_init (gpointer klass)
           "the service associated with this D-BUS tube object.",
           "",
           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_boxed (
@@ -165,10 +141,7 @@ salut_tube_iface_base_init (gpointer klass)
           "GHashTable containing parameters of this DBUS tube object.",
           G_TYPE_HASH_TABLE,
           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 (
@@ -176,10 +149,7 @@ salut_tube_iface_base_init (gpointer klass)
           "Tube state",
           "The SalutTubeState of this DBUS tube object",
           0, G_MAXUINT32, TP_TUBE_STATE_REMOTE_PENDING,
-          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/src/tube-stream.c b/src/tube-stream.c
index a968c0c..b855cf4 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1197,10 +1197,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
       "address of the local service",
       0, NUM_TP_SOCKET_ADDRESS_TYPES - 1,
       TP_SOCKET_ADDRESS_TYPE_UNIX,
-      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_ADDRESS_TYPE,
       param_spec);
 
@@ -1209,10 +1206,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
       "address",
       "The listening address of the local service, as indicated by the "
       "address-type",
-      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_ADDRESS, param_spec);
 
   param_spec = g_param_spec_uint (
@@ -1222,10 +1216,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
       "the local service applies to the local socket",
       0, NUM_TP_SOCKET_ACCESS_CONTROLS - 1,
       TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
-      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_ACCESS_CONTROL,
       param_spec);
 
@@ -1234,10 +1225,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class)
       "access control param",
       "A parameter for the access control type, to be interpreted as specified"
       "in the documentation for the Socket_Access_Control enum.",
-      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_ACCESS_CONTROL_PARAM,
       param_spec);
 
-- 
1.5.6.5




More information about the Telepathy-commits mailing list