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

Alban Crequy alban.crequy at collabora.co.uk
Wed Oct 22 11:41:19 PDT 2008


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

diff --git a/src/salut-contact-channel.c b/src/salut-contact-channel.c
index 3eedd87..f4ad1ed 100644
--- a/src/salut-contact-channel.c
+++ b/src/salut-contact-channel.c
@@ -183,9 +183,9 @@ salut_contact_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;
     case PROP_CHANNEL_DESTROYED:
@@ -256,9 +256,6 @@ salut_contact_channel_class_init (SalutContactChannelClass *salut_contact_channe
       { "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 },
@@ -270,11 +267,6 @@ salut_contact_channel_class_init (SalutContactChannelClass *salut_contact_channe
         NULL,
         channel_props,
       },
-      { SALUT_IFACE_CHANNEL_FUTURE,
-        tp_dbus_properties_mixin_getter_gobject_properties,
-        NULL,
-        future_props,
-      },
       { NULL }
   };
   GObjectClass *object_class = G_OBJECT_CLASS (salut_contact_channel_class);
-- 
1.5.6.5




More information about the Telepathy-commits mailing list