[Telepathy-commits] [telepathy-gabble/master] InitiatorHandle, InitiatorID and Requested are not in FUTUR anymore

[Guillaume Desmottes]

---
 src/olpc-activity-view.c |    6 +++---
 src/olpc-buddy-view.c    |    6 +++---
 src/olpc-view.c          |   12 ------------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/olpc-activity-view.c b/src/olpc-activity-view.c
index 40a1d92..f9f02a9 100644
--- a/src/olpc-activity-view.c
+++ b/src/olpc-activity-view.c
@@ -137,9 +137,9 @@ gabble_olpc_activity_view_get_property (GObject *object,
                 TP_IFACE_CHANNEL, "TargetHandleType",
                 TP_IFACE_CHANNEL, "ChannelType",
                 TP_IFACE_CHANNEL, "TargetID",
-                GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorHandle",
-                GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorID",
-                GABBLE_IFACE_CHANNEL_FUTURE, "Requested",
+                TP_IFACE_CHANNEL, "InitiatorHandle",
+                TP_IFACE_CHANNEL, "InitiatorID",
+                TP_IFACE_CHANNEL, "Requested",
                 GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "MaxSize",
                 GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "Buddies",
                 GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "Activities",
diff --git a/src/olpc-buddy-view.c b/src/olpc-buddy-view.c
index 7489fe0..2397b0c 100644
--- a/src/olpc-buddy-view.c
+++ b/src/olpc-buddy-view.c
@@ -134,9 +134,9 @@ gabble_olpc_buddy_view_get_property (GObject *object,
                 TP_IFACE_CHANNEL, "TargetHandleType",
                 TP_IFACE_CHANNEL, "ChannelType",
                 TP_IFACE_CHANNEL, "TargetID",
-                GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorHandle",
-                GABBLE_IFACE_CHANNEL_FUTURE, "InitiatorID",
-                GABBLE_IFACE_CHANNEL_FUTURE, "Requested",
+                TP_IFACE_CHANNEL, "InitiatorHandle",
+                TP_IFACE_CHANNEL, "InitiatorID",
+                TP_IFACE_CHANNEL, "Requested",
                 GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "MaxSize",
                 GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "Buddies",
                 GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW, "Activities",
diff --git a/src/olpc-view.c b/src/olpc-view.c
index dec1e85..b33b6ab 100644
--- a/src/olpc-view.c
+++ b/src/olpc-view.c
@@ -61,8 +61,6 @@ enum
   PROP_HANDLE,
   PROP_TARGET_ID,
   PROP_HANDLE_TYPE,
-
-  /* org.freedesktop.Telepathy.Channel.FUTURE D-Bus properties */
   PROP_REQUESTED,
   PROP_INITIATOR_HANDLE,
   PROP_INITIATOR_ID,
@@ -105,13 +103,11 @@ G_DEFINE_TYPE_WITH_CODE (
       tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
-    G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CHANNEL_FUTURE, NULL);
     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_OLPC_CHANNEL_INTERFACE_VIEW, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL);
     );
 
 static const gchar *gabble_olpc_view_interfaces[] = {
-    GABBLE_IFACE_CHANNEL_FUTURE,
     GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW,
     NULL
 };
@@ -366,9 +362,6 @@ gabble_olpc_view_class_init (GabbleOlpcViewClass *gabble_olpc_view_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 },
@@ -386,11 +379,6 @@ gabble_olpc_view_class_init (GabbleOlpcViewClass *gabble_olpc_view_class)
         NULL,
         channel_props,
       },
-      { GABBLE_IFACE_CHANNEL_FUTURE,
-        tp_dbus_properties_mixin_getter_gobject_properties,
-        NULL,
-        future_props,
-      },
       { GABBLE_IFACE_OLPC_CHANNEL_INTERFACE_VIEW,
         tp_dbus_properties_mixin_getter_gobject_properties,
         NULL,
-- 
1.5.6.5