[next] telepathy-rakia: RakiaTextChannel: stop reimplementing Channel properties

[Simon McVittie]

Module: telepathy-rakia
Branch: next
Commit: 5981bd3158254abe963e518be8d8de25a3632a75
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=5981bd3158254abe963e518be8d8de25a3632a75

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr 22 14:39:00 2014 +0100

RakiaTextChannel: stop reimplementing Channel properties

TpBaseChannel already has a perfectly good implementation of these.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77189

---

 rakia/text-channel.c |   24 ------------------------
 rakia/text-channel.h |    2 --
 2 files changed, 26 deletions(-)

diff --git a/rakia/text-channel.c b/rakia/text-channel.c
index 859ea95..6d93465 100644
--- a/rakia/text-channel.c
+++ b/rakia/text-channel.c
@@ -220,25 +220,6 @@ static void
 rakia_text_channel_class_init(RakiaTextChannelClass *klass)
 {
   TpBaseChannelClass *base_class = TP_BASE_CHANNEL_CLASS (klass);
-  static TpDBusPropertiesMixinPropImpl channel_props[] = {
-      { "ChannelType", "channel-type", NULL },
-      { "Interfaces", "interfaces", NULL },
-      { "TargetEntityType", "entity-type", NULL },
-      { "TargetHandle", "handle", NULL },
-      { "TargetID", "target-id", NULL },
-      { "InitiatorHandle", "initiator-handle", NULL },
-      { "InitiatorID", "initiator-id", NULL },
-      { "Requested", "requested", NULL },
-      { NULL }
-  };
-  static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
-      { TP_IFACE_CHANNEL,
-        tp_dbus_properties_mixin_getter_gobject_properties,
-        NULL,
-        channel_props,
-      },
-      { NULL }
-  };
 
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
@@ -260,11 +241,6 @@ rakia_text_channel_class_init(RakiaTextChannelClass *klass)
   base_class->get_object_path_suffix =
     rakia_text_channel_get_object_path_suffix;
 
-  klass->dbus_props_class.interfaces =
-      prop_interfaces;
-  tp_dbus_properties_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (RakiaTextChannelClass, dbus_props_class));
-
   tp_message_mixin_init_dbus_properties (object_class);
 }
 
diff --git a/rakia/text-channel.h b/rakia/text-channel.h
index 83f0702..65eb303 100644
--- a/rakia/text-channel.h
+++ b/rakia/text-channel.h
@@ -33,8 +33,6 @@ typedef struct _RakiaTextChannelClass RakiaTextChannelClass;
 
 struct _RakiaTextChannelClass {
     TpBaseChannelClass parent_class;
-
-    TpDBusPropertiesMixinClass dbus_props_class;
 };
 
 struct _RakiaTextChannel {