[Telepathy-commits] [telepathy-salut/master] SalutMucChannel: Requested, InitiatorID, InitiatorHandle are no more future properties

[Alban Crequy]

---
 src/salut-muc-channel.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/salut-muc-channel.c b/src/salut-muc-channel.c
index b670c38..58d5d3e 100644
--- a/src/salut-muc-channel.c
+++ b/src/salut-muc-channel.c
@@ -221,9 +221,9 @@ salut_muc_channel_get_property (GObject    *object,
                 TP_IFACE_CHANNEL, "TargetHandleType",
                 TP_IFACE_CHANNEL, "ChannelType",
                 TP_IFACE_CHANNEL, "TargetID",
-                SALUT_IFACE_CHANNEL_FUTURE, "InitiatorHandle",
-                SALUT_IFACE_CHANNEL_FUTURE, "InitiatorID",
-                SALUT_IFACE_CHANNEL_FUTURE, "Requested",
+                TP_IFACE_CHANNEL, "InitiatorHandle",
+                TP_IFACE_CHANNEL, "InitiatorID",
+                TP_IFACE_CHANNEL, "Requested",
                 NULL));
         break;
     default:
@@ -737,9 +737,6 @@ salut_muc_channel_class_init (SalutMucChannelClass *salut_muc_channel_class) {
       { "TargetID", "target-id", NULL },
       { "ChannelType", "channel-type", NULL },
       { "Interfaces", "interfaces", NULL },
-      { NULL }
-  };
-  static TpDBusPropertiesMixinPropImpl future_props[] = {
       { "Requested", "requested", NULL },
       { "InitiatorHandle", "initiator-handle", NULL },
       { "InitiatorID", "initiator-id", NULL },
@@ -751,11 +748,6 @@ salut_muc_channel_class_init (SalutMucChannelClass *salut_muc_channel_class) {
         NULL,
         channel_props,
       },
-      { SALUT_IFACE_CHANNEL_FUTURE,
-        tp_dbus_properties_mixin_getter_gobject_properties,
-        NULL,
-        future_props,
-      },
       { NULL }
   };
 
-- 
1.5.6.5