[Telepathy-commits] [telepathy-sofiasip/master] Removed const qualifiers for members of DBus property mixin initializer arrays

Mikhail Zabaluev mikhail.zabaluev at nokia.com
Thu Nov 6 05:07:19 PST 2008


They are non-const as per the API, and must in fact be writable.
---
 src/sip-media-channel.c |    9 +++++----
 src/sip-text-channel.c  |    9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/sip-media-channel.c b/src/sip-media-channel.c
index 5fb28f9..57012f1 100644
--- a/src/sip-media-channel.c
+++ b/src/sip-media-channel.c
@@ -235,7 +235,7 @@ static gboolean tpsip_media_channel_remove_with_reason (
 static void
 tpsip_media_channel_class_init (TpsipMediaChannelClass *klass)
 {
-  static const TpDBusPropertiesMixinPropImpl channel_props[] = {
+  static TpDBusPropertiesMixinPropImpl channel_props[] = {
       { "ChannelType", "channel-type", NULL },
       { "Interfaces", "interfaces", NULL },
       { "TargetHandleType", "handle-type", NULL },
@@ -246,14 +246,15 @@ tpsip_media_channel_class_init (TpsipMediaChannelClass *klass)
       { "Requested", "requested", NULL },
       { NULL }
   };
-  static const TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
+  static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
       { TP_IFACE_CHANNEL,
         tp_dbus_properties_mixin_getter_gobject_properties,
         NULL,
-        (TpDBusPropertiesMixinPropImpl *) channel_props,
+        channel_props,
       },
       { NULL }
   };
+
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GParamSpec *param_spec;
 
@@ -333,7 +334,7 @@ tpsip_media_channel_class_init (TpsipMediaChannelClass *klass)
       media_channel_property_signatures, NUM_TP_PROPS, NULL);
 
   klass->dbus_props_class.interfaces =
-      (TpDBusPropertiesMixinIfaceImpl *) prop_interfaces;
+      prop_interfaces;
   tp_dbus_properties_mixin_class_init (object_class,
       G_STRUCT_OFFSET (TpsipMediaChannelClass, dbus_props_class));
 
diff --git a/src/sip-text-channel.c b/src/sip-text-channel.c
index 89a4160..734b5cc 100644
--- a/src/sip-text-channel.c
+++ b/src/sip-text-channel.c
@@ -216,7 +216,7 @@ static void tpsip_text_channel_finalize(GObject *object);
 static void
 tpsip_text_channel_class_init(TpsipTextChannelClass *klass)
 {
-  static const TpDBusPropertiesMixinPropImpl channel_props[] = {
+  static TpDBusPropertiesMixinPropImpl channel_props[] = {
       { "ChannelType", "channel-type", NULL },
       { "Interfaces", "interfaces", NULL },
       { "TargetHandleType", "handle-type", NULL },
@@ -227,14 +227,15 @@ tpsip_text_channel_class_init(TpsipTextChannelClass *klass)
       { "Requested", "requested", NULL },
       { NULL }
   };
-  static const TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
+  static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
       { TP_IFACE_CHANNEL,
         tp_dbus_properties_mixin_getter_gobject_properties,
         NULL,
-        (TpDBusPropertiesMixinPropImpl *) channel_props,
+        channel_props,
       },
       { NULL }
   };
+
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GParamSpec *param_spec;
 
@@ -303,7 +304,7 @@ tpsip_text_channel_class_init(TpsipTextChannelClass *klass)
   g_object_class_install_property (object_class, PROP_CHANNEL_DESTROYED, param_spec);
 
   klass->dbus_props_class.interfaces =
-      (TpDBusPropertiesMixinIfaceImpl *) prop_interfaces;
+      prop_interfaces;
   tp_dbus_properties_mixin_class_init (object_class,
       G_STRUCT_OFFSET (TpsipTextChannelClass, dbus_props_class));
 }
-- 
1.5.6.5



More information about the Telepathy-commits mailing list