[telepathy-gabble/master] use G_PARAM_STATIC_STRINGS

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Mar 30 03:04:14 PDT 2009


---
 src/file-transfer-channel.c |   62 +++++++++++-------------------------------
 1 files changed, 16 insertions(+), 46 deletions(-)

diff --git a/src/file-transfer-channel.c b/src/file-transfer-channel.c
index f86aa18..8ab5da4 100644
--- a/src/file-transfer-channel.c
+++ b/src/file-transfer-channel.c
@@ -553,23 +553,20 @@ gabble_file_transfer_channel_class_init (
   param_spec = g_param_spec_boolean ("requested", "Requested?",
       "True if this channel was requested by the local user",
       FALSE,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_REQUESTED, param_spec);
 
  param_spec = g_param_spec_uint ("initiator-handle", "Initiator's handle",
       "The contact who initiated the channel",
       0, G_MAXUINT32, 0,
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
-      G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_INITIATOR_HANDLE,
       param_spec);
 
   param_spec = g_param_spec_string ("initiator-id", "Initiator's bare JID",
       "The string obtained by inspecting the initiator-handle",
       NULL,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_STATIC_NAME);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_INITIATOR_ID,
       param_spec);
 
@@ -579,18 +576,13 @@ gabble_file_transfer_channel_class_init (
       "connection for this IM channel",
       GABBLE_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);
 
   param_spec = g_param_spec_boxed ("interfaces", "Extra D-Bus interfaces",
       "Additional Channel.Interface.* interfaces",
       G_TYPE_STRV,
-      G_PARAM_READABLE |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB |
-      G_PARAM_STATIC_NAME);
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_INTERFACES, param_spec);
 
   param_spec = g_param_spec_uint (
@@ -601,9 +593,7 @@ gabble_file_transfer_channel_class_init (
       NUM_TP_FILE_TRANSFER_STATES,
       TP_FILE_TRANSFER_STATE_NONE,
       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_STATE, param_spec);
 
   param_spec = g_param_spec_string (
@@ -612,9 +602,7 @@ gabble_file_transfer_channel_class_init (
       "ContentType of the file",
       "application/octet-stream",
       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_CONTENT_TYPE,
       param_spec);
 
@@ -624,9 +612,7 @@ gabble_file_transfer_channel_class_init (
       "Name of the file",
       "",
       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_FILENAME, param_spec);
 
   param_spec = g_param_spec_uint64 (
@@ -637,9 +623,7 @@ gabble_file_transfer_channel_class_init (
       G_MAXUINT64,
       GABBLE_UNDEFINED_FILE_SIZE,
       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_SIZE, param_spec);
 
   param_spec = g_param_spec_uint (
@@ -650,9 +634,7 @@ gabble_file_transfer_channel_class_init (
       NUM_TP_FILE_HASH_TYPES,
       TP_FILE_HASH_TYPE_NONE,
       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_CONTENT_HASH_TYPE,
       param_spec);
 
@@ -662,9 +644,7 @@ gabble_file_transfer_channel_class_init (
       "Hash of the file contents",
       "",
       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_CONTENT_HASH,
       param_spec);
 
@@ -674,9 +654,7 @@ gabble_file_transfer_channel_class_init (
       "Description of the file",
       "",
       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_DESCRIPTION, param_spec);
 
   param_spec = g_param_spec_boxed (
@@ -684,9 +662,7 @@ gabble_file_transfer_channel_class_init (
       "GabbleSupportedSocketMap available-socket-types",
       "Available socket types",
       TP_HASH_TYPE_SUPPORTED_SOCKET_MAP,
-      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_AVAILABLE_SOCKET_TYPES,
       param_spec);
 
@@ -697,9 +673,7 @@ gabble_file_transfer_channel_class_init (
       0,
       G_MAXUINT64,
       0,
-      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_TRANSFERRED_BYTES,
       param_spec);
 
@@ -711,9 +685,7 @@ gabble_file_transfer_channel_class_init (
       G_MAXUINT64,
       0,
       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_INITIAL_OFFSET,
       param_spec);
 
@@ -725,9 +697,7 @@ gabble_file_transfer_channel_class_init (
       G_MAXUINT64,
       0,
       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_DATE,
       param_spec);
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list