Cope with TpChannelIface channel-type property becoming writeable in telepathy-glib > 0.7.0, avoiding warnings when channels are constructed (fd.o #13896).

If telepathy-glib is <= 0.7.0, the added code will never execute, but is
harmless.

20080103162154-53eee-c3e2cbf7bab827e33bea37ad837da8fcaacd57f9.gz

5 files changed, 17 insertions, 15 deletions

diff --git a/src/gabble-im-channel.c b/src/gabble-im-channel.c
index 961435639..d8b40b571 100644
--- a/src/gabble-im-channel.c
+++ b/src/gabble-im-channel.c
@@ -187,8 +187,9 @@ gabble_im_channel_set_property (GObject     *object,
       priv->handle = g_value_get_uint (value);
       break;
     case PROP_HANDLE_TYPE:
-      /* this property is writable in the interface, but not actually
-       * meaningfully changable on this channel, so we do nothing */
+    case PROP_CHANNEL_TYPE:
+      /* these properties are writable in the interface, but not actually
+       * meaningfully changeable on this channel, so we do nothing */
       break;
     case PROP_CONNECTION:
       priv->conn = g_value_get_object (value);
diff --git a/src/gabble-media-channel.c b/src/gabble-media-channel.c
index 9b6cd4e62..f8709e2de 100644
--- a/src/gabble-media-channel.c
+++ b/src/gabble-media-channel.c
@@ -390,12 +390,10 @@ gabble_media_channel_set_property (GObject     *object,
       g_free (priv->object_path);
       priv->object_path = g_value_dup_string (value);
       break;
-    case PROP_HANDLE:
-      /* this property is writable in the interface, but not actually
-       * meaningfully changable on this channel, so we do nothing */
-      break;
     case PROP_HANDLE_TYPE:
-      /* this property is writable in the interface, but not actually
+    case PROP_HANDLE:
+    case PROP_CHANNEL_TYPE:
+      /* these properties are writable in the interface, but not actually
        * meaningfully changable on this channel, so we do nothing */
       break;
     case PROP_CONNECTION:
diff --git a/src/gabble-muc-channel.c b/src/gabble-muc-channel.c
index dcabd7499..ed4e735c7 100644
--- a/src/gabble-muc-channel.c
+++ b/src/gabble-muc-channel.c
@@ -738,8 +738,9 @@ gabble_muc_channel_set_property (GObject     *object,
       priv->handle = g_value_get_uint (value);
       break;
     case PROP_HANDLE_TYPE:
-      /* this property is writable in the interface, but not actually
-       * meaningfully changable on this channel, so we do nothing */
+    case PROP_CHANNEL_TYPE:
+      /* these properties are writable in the interface, but not actually
+       * meaningfully changeable on this channel, so we do nothing */
       break;
     case PROP_CONNECTION:
       priv->conn = g_value_get_object (value);
diff --git a/src/gabble-roomlist-channel.c b/src/gabble-roomlist-channel.c
index e2d2e530d..1a46d2dfb 100644
--- a/src/gabble-roomlist-channel.c
+++ b/src/gabble-roomlist-channel.c
@@ -181,13 +181,11 @@ gabble_roomlist_channel_set_property (GObject     *object,
       g_free (priv->object_path);
       priv->object_path = g_value_dup_string (value);
       break;
-    case PROP_HANDLE:
-      /* this property is writable in the interface, but not actually
-       * meaningfully changable on this channel, so we do nothing */
-      break;
     case PROP_HANDLE_TYPE:
-      /* this property is writable in the interface, but not actually
-       * meaningfully changable on this channel, so we do nothing */
+    case PROP_HANDLE:
+    case PROP_CHANNEL_TYPE:
+      /* these properties are writable in the interface, but not actually
+       * meaningfully changeable on this channel, so we do nothing */
       break;
     case PROP_CONNECTION:
       priv->conn = g_value_get_object (value);
diff --git a/src/gabble-roster-channel.c b/src/gabble-roster-channel.c
index 2f208f8fd..1c3bc6a08 100644
--- a/src/gabble-roster-channel.c
+++ b/src/gabble-roster-channel.c
@@ -219,6 +219,10 @@ gabble_roster_channel_set_property (GObject     *object,
     case PROP_OBJECT_PATH:
       g_free (priv->object_path);
       priv->object_path = g_value_dup_string (value);
+    case PROP_CHANNEL_TYPE:
+      /* in telepathy-glib > 0.7.0 this property is writable in the
+       * interface, but not actually meaningfully changeable on this channel,
+       * so we do nothing */
       break;
     case PROP_HANDLE_TYPE:
       priv->handle_type = g_value_get_uint (value);