[Telepathy-commits] [telepathy-gabble/master] Update to spec 0.17.13, moving various future Channel properties to the present
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Oct 15 01:01:30 PDT 2008
This requires telepathy-glib 0.7.17, which I just released.
---
configure.ac | 2 +-
extensions/Channel_Future.xml | 123 --------------------
src/im-channel.c | 18 +---
src/media-channel.c | 18 +---
src/muc-channel.c | 18 +---
src/roomlist-channel.c | 24 +---
src/roster-channel.c | 18 +---
src/tubes-channel.c | 18 +---
tests/twisted/jingle/test-incoming-call-reject.py | 11 +--
tests/twisted/jingle/test-incoming-call.py | 11 +--
.../jingle/test-outgoing-call-deprecated.py | 11 +--
.../jingle/test-outgoing-call-deprecated2.py | 11 +--
tests/twisted/jingle/test-outgoing-call-ensure.py | 18 ++--
.../jingle/test-outgoing-call-requestotron.py | 23 ++---
tests/twisted/jingle/test-outgoing-call.py | 23 ++---
tests/twisted/muc/roomlist.py | 26 ++---
tests/twisted/muc/test-muc-invitation.py | 11 +--
tests/twisted/muc/test-muc.py | 14 +--
tests/twisted/roster/groups.py | 10 +-
tests/twisted/roster/test-roster.py | 11 +--
tests/twisted/text/ensure.py | 6 +-
tests/twisted/text/initiate-requestotron.py | 6 +-
tests/twisted/text/initiate.py | 17 +--
tests/twisted/text/respawn.py | 34 ++----
tests/twisted/text/test-text.py | 17 +--
.../tubes/test-muc-accept-stream-tube-ibb.py | 11 +--
tests/twisted/tubes/test-muc-offer-dbus-tube.py | 11 +--
tests/twisted/tubes/test-si-tubes.py | 16 +--
28 files changed, 123 insertions(+), 414 deletions(-)
diff --git a/configure.ac b/configure.ac
index b5e9a3e..5e4dcb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,7 +126,7 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95, dbus-glib-1 >= 0.73])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
-PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.7.16])
+PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.7.17])
AC_SUBST(TP_GLIB_CFLAGS)
AC_SUBST(TP_GLIB_LIBS)
diff --git a/extensions/Channel_Future.xml b/extensions/Channel_Future.xml
index 131b655..235ff2c 100644
--- a/extensions/Channel_Future.xml
+++ b/extensions/Channel_Future.xml
@@ -42,129 +42,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
</tp:rationale>
</tp:docstring>
- <property name="Requested" tp:name-for-bindings="Requested"
- type="b" access="read">
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>True if this channel was created in response to a local request,
- such as a call to
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.RequestChannel</tp:dbus-ref>
- or
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>.</p>
-
- <tp:rationale>
- <p>The idea of this property is to distinguish between "incoming"
- and "outgoing" channels, in a way that doesn't break down when
- considering special cases like contact lists that are automatically
- created on connection to the server, or chatrooms that an
- IRC proxy/bouncer like irssi-proxy or bip was already in.</p>
-
- <p>The reason we want to make that distinction is that UIs for
- things that the user explicitly requested should start up
- automatically, whereas for incoming messages and VoIP calls we
- should first ask the user whether they want to open the messaging
- UI or accept the call.</p>
- </tp:rationale>
-
- <p>If the channel was not explicitly requested (even if it was
- created as a side-effect of a call to one of those functions,
- e.g. because joining a Tube in a MUC context on XMPP implies
- joining that MUC), then this property is false.</p>
-
- <p>For compatibility with older connection managers, clients SHOULD
- assume that this property is true if they see a channel announced
- by the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.NewChannel</tp:dbus-ref>
- signal with the suppress_handler parameter set to true.</p>
-
- <tp:rationale>
- <p>In a correct connection manager, the only way to get such a
- channel is to request it.</p>
- </tp:rationale>
-
- <p>Clients MAY additionally assume that this property is false
- if they see a channel announced by the NewChannel signal with the
- suppress_handler parameter set to false.</p>
-
- <tp:rationale>
- <p>This is more controversial, since it's possible to get that
- parameter set to false by requesting a channel. However, there's
- no good reason to do so, and we've deprecated this practice.</p>
-
- <p>In the particular case of the channel dispatcher, the only
- side-effect of wrongly thinking a channel is unrequested
- is likely to be that the user has to confirm that they want to
- use it, so it seems fairly harmless to assume in the channel
- dispatcher that channels with suppress_handler false are
- indeed unrequested.</p>
- </tp:rationale>
- </tp:docstring>
- </property>
-
- <property name="InitiatorHandle" type="u" tp:type="Contact_Handle"
- access="read" tp:name-for-bindings="Initiator_Handle">
- <tp:added version="0.17.7">(in Channel.FUTURE
- pseudo-interface)</tp:added>
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The contact who initiated the channel. For channels requested by the
- local user, this MUST be the value of
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.SelfHandle</tp:dbus-ref>
- at the time the channel was created (i.e. not a channel-specific
- handle).</p>
-
- <tp:rationale>
- <p>The careful wording about the self-handle is because the Renaming
- interface can cause the return from Connection.GetSelfHandle to
- change. It's something of a specification bug that we don't signal
- this in the Connection interface yet.</p>
- </tp:rationale>
-
- <p>For channels requested by a remote user, this MUST be their handle.
- If unavailable or not applicable, this MUST be 0 (for instance,
- contact lists are not really initiated by anyone in particular, and
- it's easy to imagine a protocol where chatroom invitations can be
- anonymous).</p>
-
- <p>For channels with the Group interface, this SHOULD be the same
- contact who is signalled as the "Actor" causing the self-handle
- to be placed in the local-pending set.</p>
-
- <p>This SHOULD NOT be a channel-specific handle, if possible.</p>
-
- <p>It does not make sense for this property to be in channel
- requests - the initiator will always be the local user - so it
- MUST NOT be accepted.</p>
- </tp:docstring>
- </property>
-
- <property name="InitiatorID" type="s" access="read"
- tp:name-for-bindings="Initiator_ID">
- <tp:added version="0.17.7">(in Channel.FUTURE
- pseudo-interface)</tp:added>
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>The string that would result from inspecting the InitiatorHandle
- property (i.e. the initiator's identifier in the IM protocol).</p>
-
- <tp:rationale>
- <p>The presence of this property avoids the following race
- condition:</p>
-
- <ul>
- <li>New StreamedMedia channel C is signalled with initiator
- handle I</li>
- <li>Client calls InspectHandles(CONTACT, [I])</li>
- <li>Channel C closes, removing the last reference to handle I</li>
- <li>InspectHandles(CONTACT, [I]) returns an error</li>
- <li>Client can indicate that a call was missed, but not who
- called!</li>
- </ul>
- </tp:rationale>
-
- <p>It does not make sense for this property to be in channel
- requests - the initiator will always be the local user - so it
- MUST NOT be accepted.</p>
- </tp:docstring>
- </property>
-
<property name="Bundle" tp:name-for-bindings="Bundle"
type="o" access="read">
<tp:added version="0.17.9">(in Channel.FUTURE
diff --git a/src/im-channel.c b/src/im-channel.c
index 17979f2..352aa82 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -34,8 +34,6 @@
#include <telepathy-glib/svc-channel.h>
#include <telepathy-glib/svc-generic.h>
-#include "extensions/extensions.h"
-
#define DEBUG_FLAG GABBLE_DEBUG_IM
#include "connection.h"
#include "debug.h"
@@ -49,7 +47,6 @@ static void text_iface_init (gpointer, gpointer);
static void chat_state_iface_init (gpointer, gpointer);
G_DEFINE_TYPE_WITH_CODE (GabbleIMChannel, gabble_im_channel, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CHANNEL_FUTURE, NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
tp_dbus_properties_mixin_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
@@ -61,7 +58,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleIMChannel, gabble_im_channel, G_TYPE_OBJECT,
static const gchar *gabble_im_channel_interfaces[] = {
TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE,
- GABBLE_IFACE_CHANNEL_FUTURE,
NULL
};
@@ -221,9 +217,9 @@ gabble_im_channel_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",
NULL));
break;
default:
@@ -283,9 +279,6 @@ gabble_im_channel_class_init (GabbleIMChannelClass *gabble_im_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 },
@@ -297,11 +290,6 @@ gabble_im_channel_class_init (GabbleIMChannelClass *gabble_im_channel_class)
NULL,
channel_props,
},
- { GABBLE_IFACE_CHANNEL_FUTURE,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- future_props,
- },
{ NULL }
};
GObjectClass *object_class = G_OBJECT_CLASS (gabble_im_channel_class);
diff --git a/src/media-channel.c b/src/media-channel.c
index 6839eb1..3dc3d51 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -32,8 +32,6 @@
#include <telepathy-glib/svc-channel.h>
#include <telepathy-glib/svc-properties-interface.h>
-#include "extensions/extensions.h"
-
#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
#include "connection.h"
@@ -54,7 +52,6 @@ static void streamed_media_iface_init (gpointer, gpointer);
G_DEFINE_TYPE_WITH_CODE (GabbleMediaChannel, gabble_media_channel,
G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CHANNEL_FUTURE, NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_STATE,
call_state_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
@@ -77,7 +74,6 @@ static const gchar *gabble_media_channel_interfaces[] = {
appear in GetInterfaces' output to avoid confusing clients
TP_IFACE_CHANNEL_INTERFACE_CALL_STATE,
*/
- GABBLE_IFACE_CHANNEL_FUTURE,
TP_IFACE_CHANNEL_INTERFACE_GROUP,
TP_IFACE_CHANNEL_INTERFACE_HOLD,
TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING,
@@ -483,9 +479,9 @@ gabble_media_channel_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",
NULL));
break;
default:
@@ -577,9 +573,6 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
{ "TargetID", "target-id", NULL },
{ "ChannelType", "channel-type", NULL },
{ "Interfaces", "interfaces", NULL },
- { NULL }
- };
- static TpDBusPropertiesMixinPropImpl future_props[] = {
{ "Requested", "requested", NULL },
{ "InitiatorHandle", "creator", NULL },
{ "InitiatorID", "creator-id", NULL },
@@ -591,11 +584,6 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c
NULL,
channel_props,
},
- { GABBLE_IFACE_CHANNEL_FUTURE,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- future_props,
- },
{ NULL }
};
GObjectClass *object_class = G_OBJECT_CLASS (gabble_media_channel_class);
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 45371ef..d0c2311 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -34,8 +34,6 @@
#include <telepathy-glib/interfaces.h>
#include <telepathy-glib/channel-iface.h>
-#include "extensions/extensions.h"
-
#define DEBUG_FLAG GABBLE_DEBUG_MUC
#include "connection.h"
#include "conn-aliasing.h"
@@ -64,7 +62,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleMucChannel, gabble_muc_channel,
tp_dbus_properties_mixin_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL,
channel_iface_init);
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CHANNEL_FUTURE, NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROPERTIES_INTERFACE,
tp_properties_mixin_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
@@ -80,7 +77,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleMucChannel, gabble_muc_channel,
)
static const gchar *gabble_muc_channel_interfaces[] = {
- GABBLE_IFACE_CHANNEL_FUTURE,
TP_IFACE_CHANNEL_INTERFACE_GROUP,
TP_IFACE_CHANNEL_INTERFACE_PASSWORD,
TP_IFACE_PROPERTIES_INTERFACE,
@@ -857,9 +853,9 @@ gabble_muc_channel_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",
NULL));
break;
default:
@@ -941,9 +937,6 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_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 },
@@ -955,11 +948,6 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class)
NULL,
channel_props,
},
- { GABBLE_IFACE_CHANNEL_FUTURE,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- future_props,
- },
{ NULL }
};
GObjectClass *object_class = G_OBJECT_CLASS (gabble_muc_channel_class);
diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
index 6999d2d..94dfe42 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -33,8 +33,6 @@
#include <telepathy-glib/svc-channel.h>
#include <telepathy-glib/svc-generic.h>
-#include "extensions/extensions.h"
-
#define DEBUG_FLAG GABBLE_DEBUG_ROOMLIST
#include "connection.h"
@@ -51,7 +49,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleRoomlistChannel, gabble_roomlist_channel,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
tp_dbus_properties_mixin_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CHANNEL_FUTURE, NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST,
roomlist_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
@@ -59,7 +56,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleRoomlistChannel, gabble_roomlist_channel,
);
static const gchar *gabble_roomlist_channel_interfaces[] = {
- GABBLE_IFACE_CHANNEL_FUTURE,
NULL
};
@@ -200,9 +196,9 @@ gabble_roomlist_channel_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",
TP_IFACE_CHANNEL_TYPE_ROOM_LIST, "Server",
NULL));
break;
@@ -277,18 +273,15 @@ gabble_roomlist_channel_class_init (GabbleRoomlistChannelClass *gabble_roomlist_
{ "TargetID", "target-id", NULL },
{ "ChannelType", "channel-type", NULL },
{ "Interfaces", "interfaces", NULL },
+ { "Requested", "requested", NULL },
+ { "InitiatorHandle", "initiator-handle", NULL },
+ { "InitiatorID", "initiator-id", NULL },
{ NULL }
};
static TpDBusPropertiesMixinPropImpl roomlist_props[] = {
{ "Server", "conference-server", NULL },
{ NULL }
};
- static TpDBusPropertiesMixinPropImpl future_props[] = {
- { "Requested", "requested", NULL },
- { "InitiatorHandle", "initiator-handle", NULL },
- { "InitiatorID", "initiator-id", NULL },
- { NULL }
- };
static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
{ TP_IFACE_CHANNEL,
tp_dbus_properties_mixin_getter_gobject_properties,
@@ -300,11 +293,6 @@ gabble_roomlist_channel_class_init (GabbleRoomlistChannelClass *gabble_roomlist_
NULL,
roomlist_props,
},
- { GABBLE_IFACE_CHANNEL_FUTURE,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- future_props,
- },
{ NULL }
};
GObjectClass *object_class = G_OBJECT_CLASS (gabble_roomlist_channel_class);
diff --git a/src/roster-channel.c b/src/roster-channel.c
index 5e6b6d6..87a69bc 100644
--- a/src/roster-channel.c
+++ b/src/roster-channel.c
@@ -31,8 +31,6 @@
#include <telepathy-glib/svc-generic.h>
#include <telepathy-glib/svc-channel.h>
-#include "extensions/extensions.h"
-
#define DEBUG_FLAG GABBLE_DEBUG_ROSTER
#include "connection.h"
@@ -45,7 +43,6 @@ static void channel_iface_init (gpointer, gpointer);
G_DEFINE_TYPE_WITH_CODE (GabbleRosterChannel, gabble_roster_channel,
G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CHANNEL_FUTURE, NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
tp_group_mixin_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST, NULL);
@@ -55,7 +52,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleRosterChannel, gabble_roster_channel,
G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL));
static const gchar *gabble_roster_channel_interfaces[] = {
- GABBLE_IFACE_CHANNEL_FUTURE,
TP_IFACE_CHANNEL_INTERFACE_GROUP,
NULL
};
@@ -253,9 +249,9 @@ gabble_roster_channel_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",
NULL));
break;
default:
@@ -314,9 +310,6 @@ gabble_roster_channel_class_init (GabbleRosterChannelClass *gabble_roster_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 },
@@ -328,11 +321,6 @@ gabble_roster_channel_class_init (GabbleRosterChannelClass *gabble_roster_channe
NULL,
channel_props,
},
- { GABBLE_IFACE_CHANNEL_FUTURE,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- future_props,
- },
{ NULL }
};
GObjectClass *object_class = G_OBJECT_CLASS (gabble_roster_channel_class);
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index f8e340a..6ebff15 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -40,8 +40,6 @@
#include <telepathy-glib/svc-channel.h>
#include <telepathy-glib/svc-generic.h>
-#include "extensions/extensions.h"
-
#define DEBUG_FLAG GABBLE_DEBUG_TUBES
#include "bytestream-factory.h"
@@ -66,7 +64,6 @@ G_DEFINE_TYPE_WITH_CODE (GabbleTubesChannel, gabble_tubes_channel,
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
tp_dbus_properties_mixin_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
- G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CHANNEL_FUTURE, NULL);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TUBES, tubes_iface_init);
G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
tp_external_group_mixin_iface_init);
@@ -78,7 +75,6 @@ static const gchar *gabble_tubes_channel_interfaces[] = {
/* If more interfaces are added, either keep Group as the first, or change
* the implementations of gabble_tubes_channel_get_interfaces () and
* gabble_tubes_channel_get_property () too */
- GABBLE_IFACE_CHANNEL_FUTURE,
NULL
};
@@ -276,9 +272,9 @@ gabble_tubes_channel_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",
NULL));
break;
default:
@@ -2454,9 +2450,6 @@ gabble_tubes_channel_class_init (
{ "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 },
@@ -2468,11 +2461,6 @@ gabble_tubes_channel_class_init (
NULL,
channel_props,
},
- { GABBLE_IFACE_CHANNEL_FUTURE,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- future_props,
- },
{ NULL }
};
GObjectClass *object_class = G_OBJECT_CLASS (gabble_tubes_channel_class);
diff --git a/tests/twisted/jingle/test-incoming-call-reject.py b/tests/twisted/jingle/test-incoming-call-reject.py
index 2db0a5e..a40245c 100644
--- a/tests/twisted/jingle/test-incoming-call-reject.py
+++ b/tests/twisted/jingle/test-incoming-call-reject.py
@@ -68,14 +68,9 @@ def test(q, bus, conn, stream):
assert channel_props['TargetHandle'] == remote_handle
assert channel_props['TargetHandleType'] == 1
assert channel_props['TargetID'] == 'foo at bar.com'
-
- # Exercise FUTURE properties
- future_props = media_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == False
- assert future_props['InitiatorID'] == 'foo at bar.com'
- assert future_props['InitiatorHandle'] == remote_handle
+ assert channel_props['Requested'] == False
+ assert channel_props['InitiatorID'] == 'foo at bar.com'
+ assert channel_props['InitiatorHandle'] == remote_handle
media_chan.RemoveMembers([dbus.UInt32(1)], 'rejected')
diff --git a/tests/twisted/jingle/test-incoming-call.py b/tests/twisted/jingle/test-incoming-call.py
index b43d335..2c467e3 100644
--- a/tests/twisted/jingle/test-incoming-call.py
+++ b/tests/twisted/jingle/test-incoming-call.py
@@ -73,14 +73,9 @@ def test(q, bus, conn, stream):
assert channel_props['TargetHandle'] == remote_handle
assert channel_props['TargetHandleType'] == 1
assert channel_props['TargetID'] == 'foo at bar.com'
-
- # Exercise FUTURE properties
- future_props = media_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['TargetID'] == ''
- assert future_props['InitiatorID'] == 'foo at bar.com'
- assert future_props['InitiatorHandle'] == remote_handle
+ assert channel_props['InitiatorID'] == 'foo at bar.com'
+ assert channel_props['InitiatorHandle'] == remote_handle
+ assert channel_props['Requested'] == False
media_chan.AddMembers([dbus.UInt32(1)], 'accepted')
diff --git a/tests/twisted/jingle/test-outgoing-call-deprecated.py b/tests/twisted/jingle/test-outgoing-call-deprecated.py
index 539556b..f2475c6 100644
--- a/tests/twisted/jingle/test-outgoing-call-deprecated.py
+++ b/tests/twisted/jingle/test-outgoing-call-deprecated.py
@@ -55,14 +55,9 @@ def test(q, bus, conn, stream):
assert channel_props['TargetHandleType'] == 1, channel_props
assert channel_props['TargetHandle'] == handle, channel_props
assert channel_props['TargetID'] == 'foo at bar.com', channel_props
-
- # Exercise FUTURE properties
- future_props = group_iface.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorID'] == 'test at localhost'
- assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorID'] == 'test at localhost'
+ assert channel_props['InitiatorHandle'] == conn.GetSelfHandle()
# S-E gets notified about new session handler, and calls Ready on it
e = q.expect('dbus-signal', signal='NewSessionHandler')
diff --git a/tests/twisted/jingle/test-outgoing-call-deprecated2.py b/tests/twisted/jingle/test-outgoing-call-deprecated2.py
index b4c3b02..6def8c5 100644
--- a/tests/twisted/jingle/test-outgoing-call-deprecated2.py
+++ b/tests/twisted/jingle/test-outgoing-call-deprecated2.py
@@ -53,14 +53,9 @@ def test(q, bus, conn, stream):
'org.freedesktop.Telepathy.Channel',
dbus_interface='org.freedesktop.DBus.Properties')
assert channel_props['TargetID'] == '', channel_props
-
- # Exercise FUTURE properties
- future_props = group_iface.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorID'] == 'test at localhost'
- assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorID'] == 'test at localhost'
+ assert channel_props['InitiatorHandle'] == conn.GetSelfHandle()
group_iface.AddMembers([handle], 'deprecated API')
diff --git a/tests/twisted/jingle/test-outgoing-call-ensure.py b/tests/twisted/jingle/test-outgoing-call-ensure.py
index 4534aed..cd15d12 100644
--- a/tests/twisted/jingle/test-outgoing-call-ensure.py
+++ b/tests/twisted/jingle/test-outgoing-call-ensure.py
@@ -93,11 +93,11 @@ def test(q, bus, conn, stream):
handle
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetID'] ==\
'foo at bar.com', emitted_props
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.'
'Requested'] == True
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.'
'InitiatorHandle'] == self_handle
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.'
'InitiatorID'] == 'test at localhost'
@@ -157,12 +157,12 @@ def test(q, bus, conn, stream):
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetHandle'] ==\
0
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetID'] == ''
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
- 'Requested'] == True
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
- 'InitiatorHandle'] == self_handle
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
- 'InitiatorID'] == 'test at localhost'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.Requested']\
+ == True
+ assert emitted_props['org.freedesktop.Telepathy.Channel.InitiatorHandle']\
+ == self_handle
+ assert emitted_props['org.freedesktop.Telepathy.Channel.InitiatorID'] \
+ == 'test at localhost'
media_iface = make_channel_proxy(conn, path, 'Channel.Type.StreamedMedia')
diff --git a/tests/twisted/jingle/test-outgoing-call-requestotron.py b/tests/twisted/jingle/test-outgoing-call-requestotron.py
index a2e273b..aa517a7 100644
--- a/tests/twisted/jingle/test-outgoing-call-requestotron.py
+++ b/tests/twisted/jingle/test-outgoing-call-requestotron.py
@@ -86,12 +86,12 @@ def test(q, bus, conn, stream):
handle
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetID'] ==\
'foo at bar.com', emitted_props
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
- 'Requested'] == True
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
- 'InitiatorHandle'] == self_handle
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
- 'InitiatorID'] == 'test at localhost'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.Requested'] \
+ == True
+ assert emitted_props['org.freedesktop.Telepathy.Channel.InitiatorHandle'] \
+ == self_handle
+ assert emitted_props['org.freedesktop.Telepathy.Channel.InitiatorID'] \
+ == 'test at localhost'
signalling_iface = make_channel_proxy(conn, path, 'Channel.Interface.MediaSignalling')
media_iface = make_channel_proxy(conn, path, 'Channel.Type.StreamedMedia')
@@ -121,14 +121,9 @@ def test(q, bus, conn, stream):
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
assert channel_props['TargetID'] == 'foo at bar.com', channel_props
-
- # Exercise FUTURE properties
- future_props = group_iface.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorID'] == 'test at localhost'
- assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorID'] == 'test at localhost'
+ assert channel_props['InitiatorHandle'] == conn.GetSelfHandle()
# Exercise Group Properties from spec 0.17.6 (in a basic way)
group_props = group_iface.GetAll(
diff --git a/tests/twisted/jingle/test-outgoing-call.py b/tests/twisted/jingle/test-outgoing-call.py
index a5e83b8..2d49e86 100644
--- a/tests/twisted/jingle/test-outgoing-call.py
+++ b/tests/twisted/jingle/test-outgoing-call.py
@@ -76,12 +76,12 @@ def test(q, bus, conn, stream):
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetHandle'] ==\
0
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetID'] == ''
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
- 'Requested'] == True
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
- 'InitiatorHandle'] == self_handle
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
- 'InitiatorID'] == 'test at localhost'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.Requested'] \
+ == True
+ assert emitted_props['org.freedesktop.Telepathy.Channel.InitiatorHandle'] \
+ == self_handle
+ assert emitted_props['org.freedesktop.Telepathy.Channel.InitiatorID'] \
+ == 'test at localhost'
signalling_iface = make_channel_proxy(conn, path, 'Channel.Interface.MediaSignalling')
media_iface = make_channel_proxy(conn, path, 'Channel.Type.StreamedMedia')
@@ -111,14 +111,9 @@ def test(q, bus, conn, stream):
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
assert channel_props['TargetID'] == '', channel_props
-
- # Exercise FUTURE properties
- future_props = group_iface.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorID'] == 'test at localhost'
- assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorID'] == 'test at localhost'
+ assert channel_props['InitiatorHandle'] == conn.GetSelfHandle()
# Exercise Group Properties from spec 0.17.6 (in a basic way)
group_props = group_iface.GetAll(
diff --git a/tests/twisted/muc/roomlist.py b/tests/twisted/muc/roomlist.py
index 49a4112..daefead 100644
--- a/tests/twisted/muc/roomlist.py
+++ b/tests/twisted/muc/roomlist.py
@@ -72,10 +72,10 @@ def test(q, bus, conn, stream):
assert props[tp_name_prefix + '.Channel.TargetHandleType'] == 0
assert props[tp_name_prefix + '.Channel.TargetHandle'] == 0
assert props[tp_name_prefix + '.Channel.TargetID'] == ''
- assert props[tp_name_prefix + '.Channel.FUTURE.Requested'] == True
- assert props[tp_name_prefix + '.Channel.FUTURE.InitiatorHandle'] \
+ assert props[tp_name_prefix + '.Channel.Requested'] == True
+ assert props[tp_name_prefix + '.Channel.InitiatorHandle'] \
== conn.GetSelfHandle()
- assert props[tp_name_prefix + '.Channel.FUTURE.InitiatorID'] \
+ assert props[tp_name_prefix + '.Channel.InitiatorID'] \
== 'test at localhost'
assert props[tp_name_prefix + '.Channel.Type.RoomList.Server'] == \
'conf.localhost'
@@ -98,17 +98,9 @@ def test(q, bus, conn, stream):
assert channel_props.get('ChannelType') == \
tp_name_prefix + '.Channel.Type.RoomList',\
channel_props.get('ChannelType')
- assert 'Interfaces' in channel_props
- assert tp_name_prefix + '.Channel.FUTURE' in \
- channel_props['Interfaces']
-
- # Exercise FUTURE properties
- future_props = chan.GetAll(
- tp_name_prefix + '.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorID'] == 'test at localhost'
- assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorID'] == 'test at localhost'
+ assert channel_props['InitiatorHandle'] == conn.GetSelfHandle()
assert chan.Get(
tp_name_prefix + '.Channel.Type.RoomList', 'Server',
@@ -141,10 +133,10 @@ def test(q, bus, conn, stream):
assert props[tp_name_prefix + '.Channel.TargetHandleType'] == 0
assert props[tp_name_prefix + '.Channel.TargetHandle'] == 0
assert props[tp_name_prefix + '.Channel.TargetID'] == ''
- assert props[tp_name_prefix + '.Channel.FUTURE.Requested'] == True
- assert props[tp_name_prefix + '.Channel.FUTURE.InitiatorHandle'] \
+ assert props[tp_name_prefix + '.Channel.Requested'] == True
+ assert props[tp_name_prefix + '.Channel.InitiatorHandle'] \
== conn.GetSelfHandle()
- assert props[tp_name_prefix + '.Channel.FUTURE.InitiatorID'] \
+ assert props[tp_name_prefix + '.Channel.InitiatorID'] \
== 'test at localhost'
assert props[tp_name_prefix + '.Channel.Type.RoomList.Server'] == \
'conference.example.net'
diff --git a/tests/twisted/muc/test-muc-invitation.py b/tests/twisted/muc/test-muc-invitation.py
index c91ce06..978f49f 100644
--- a/tests/twisted/muc/test-muc-invitation.py
+++ b/tests/twisted/muc/test-muc-invitation.py
@@ -57,14 +57,9 @@ def test(q, bus, conn, stream):
'org.freedesktop.Telepathy.Channel',
dbus_interface='org.freedesktop.DBus.Properties')
assert channel_props['TargetID'] == 'chat at conf.localhost', channel_props
-
- # Exercise FUTURE properties
- future_props = text_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == False
- assert future_props['InitiatorID'] == 'bob at localhost'
- assert future_props['InitiatorHandle'] == bob_handle
+ assert channel_props['Requested'] == False
+ assert channel_props['InitiatorID'] == 'bob at localhost'
+ assert channel_props['InitiatorHandle'] == bob_handle
# accept the invitation
call_async(q, group_iface, 'AddMembers', [room_self_handle], 'Oh, OK then')
diff --git a/tests/twisted/muc/test-muc.py b/tests/twisted/muc/test-muc.py
index 02cc2a1..1b3a8be 100644
--- a/tests/twisted/muc/test-muc.py
+++ b/tests/twisted/muc/test-muc.py
@@ -89,18 +89,10 @@ def test(q, bus, conn, stream):
assert 'org.freedesktop.Telepathy.Channel.Interface.ChatState' in \
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
- assert 'org.freedesktop.Telepathy.Channel.FUTURE' in \
- channel_props.get('Interfaces', ()), \
- channel_props.get('Interfaces')
assert channel_props['TargetID'] == 'chat at conf.localhost', channel_props
-
- # Exercise FUTURE properties
- future_props = text_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorID'] == 'test at localhost'
- assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorID'] == 'test at localhost'
+ assert channel_props['InitiatorHandle'] == conn.GetSelfHandle()
# Exercise Group Properties from spec 0.17.6 (in a basic way)
group_props = text_chan.GetAll(
diff --git a/tests/twisted/roster/groups.py b/tests/twisted/roster/groups.py
index c9ad6ea..0a25bf5 100644
--- a/tests/twisted/roster/groups.py
+++ b/tests/twisted/roster/groups.py
@@ -41,13 +41,9 @@ def _expect_group_channel(q, bus, conn, name, contacts):
'org.freedesktop.Telepathy.Channel',
dbus_interface='org.freedesktop.DBus.Properties')
assert channel_props['TargetID'] == name, channel_props
-
- future_props = chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == False
- assert future_props['InitiatorID'] == ''
- assert future_props['InitiatorHandle'] == 0
+ assert channel_props['Requested'] == False
+ assert channel_props['InitiatorID'] == ''
+ assert channel_props['InitiatorHandle'] == 0
def test(q, bus, conn, stream):
conn.Connect()
diff --git a/tests/twisted/roster/test-roster.py b/tests/twisted/roster/test-roster.py
index b7ad718..4a8d814 100644
--- a/tests/twisted/roster/test-roster.py
+++ b/tests/twisted/roster/test-roster.py
@@ -49,14 +49,9 @@ def _expect_contact_list_channel(q, bus, conn, name, contacts):
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
assert channel_props['TargetID'] == name, channel_props
-
- # Exercise FUTURE properties
- future_props = chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == False
- assert future_props['InitiatorID'] == ''
- assert future_props['InitiatorHandle'] == 0
+ assert channel_props['Requested'] == False
+ assert channel_props['InitiatorID'] == ''
+ assert channel_props['InitiatorHandle'] == 0
# Exercise Group Properties from spec 0.17.6 (in a basic way)
group_props = chan.GetAll(
diff --git a/tests/twisted/text/ensure.py b/tests/twisted/text/ensure.py
index cb68c16..6191e1f 100644
--- a/tests/twisted/text/ensure.py
+++ b/tests/twisted/text/ensure.py
@@ -172,11 +172,11 @@ def check_props(props, self_handle, handle, jid):
assert props['org.freedesktop.Telepathy.Channel.TargetHandle'] ==\
handle
assert props['org.freedesktop.Telepathy.Channel.TargetID'] == jid
- assert props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert props['org.freedesktop.Telepathy.Channel.'
'Requested'] == True
- assert props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert props['org.freedesktop.Telepathy.Channel.'
'InitiatorHandle'] == self_handle
- assert props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert props['org.freedesktop.Telepathy.Channel.'
'InitiatorID'] == 'test at localhost'
diff --git a/tests/twisted/text/initiate-requestotron.py b/tests/twisted/text/initiate-requestotron.py
index 1dced32..50e6989 100644
--- a/tests/twisted/text/initiate-requestotron.py
+++ b/tests/twisted/text/initiate-requestotron.py
@@ -59,11 +59,11 @@ def test(q, bus, conn, stream):
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetHandle'] ==\
foo_handle
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetID'] == jid
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.'
'Requested'] == True
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.'
'InitiatorHandle'] == self_handle
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.'
'InitiatorID'] == 'test at localhost'
assert old_sig.args[0] == ret.value[0]
diff --git a/tests/twisted/text/initiate.py b/tests/twisted/text/initiate.py
index d19af36..a1e11a7 100644
--- a/tests/twisted/text/initiate.py
+++ b/tests/twisted/text/initiate.py
@@ -54,20 +54,13 @@ def test(q, bus, conn, stream):
assert 'org.freedesktop.Telepathy.Channel.Interface.ChatState' in \
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
- assert 'org.freedesktop.Telepathy.Channel.FUTURE' in \
- channel_props.get('Interfaces', ()), \
- channel_props.get('Interfaces')
assert channel_props['TargetID'] == jid,\
(channel_props['TargetID'], jid)
-
- future_props = text_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorHandle'] == self_handle,\
- (future_props['InitiatorHandle'], self_handle)
- assert future_props['InitiatorID'] == 'test at localhost',\
- future_props['InitiatorID']
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorHandle'] == self_handle,\
+ (channel_props['InitiatorHandle'], self_handle)
+ assert channel_props['InitiatorID'] == 'test at localhost',\
+ channel_props['InitiatorID']
dbus.Interface(text_chan,
u'org.freedesktop.Telepathy.Channel.Type.Text').Send(0, 'hey')
diff --git a/tests/twisted/text/respawn.py b/tests/twisted/text/respawn.py
index 96d591a..73dd92c 100644
--- a/tests/twisted/text/respawn.py
+++ b/tests/twisted/text/respawn.py
@@ -55,11 +55,11 @@ def test(q, bus, conn, stream):
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetHandle'] ==\
foo_handle
assert emitted_props['org.freedesktop.Telepathy.Channel.TargetID'] == jid
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.'
'Requested'] == True
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.'
'InitiatorHandle'] == self_handle
- assert emitted_props['org.freedesktop.Telepathy.Channel.FUTURE.'
+ assert emitted_props['org.freedesktop.Telepathy.Channel.'
'InitiatorID'] == 'test at localhost'
channel_props = text_chan.GetAll(
@@ -67,15 +67,11 @@ def test(q, bus, conn, stream):
dbus_interface='org.freedesktop.DBus.Properties')
assert channel_props['TargetID'] == jid,\
(channel_props['TargetID'], jid)
-
- future_props = text_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorHandle'] == self_handle,\
- (future_props['InitiatorHandle'], self_handle)
- assert future_props['InitiatorID'] == 'test at localhost',\
- future_props['InitiatorID']
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorHandle'] == self_handle,\
+ (channel_props['InitiatorHandle'], self_handle)
+ assert channel_props['InitiatorID'] == 'test at localhost',\
+ channel_props['InitiatorID']
text_iface.Send(0, 'hey')
@@ -142,15 +138,11 @@ def test(q, bus, conn, stream):
dbus_interface='org.freedesktop.DBus.Properties')
assert channel_props['TargetID'] == jid,\
(channel_props['TargetID'], jid)
-
- future_props = text_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == False
- assert future_props['InitiatorHandle'] == foo_handle,\
- (future_props['InitiatorHandle'], foo_handle)
- assert future_props['InitiatorID'] == 'foo at bar.com',\
- future_props['InitiatorID']
+ assert channel_props['Requested'] == False
+ assert channel_props['InitiatorHandle'] == foo_handle,\
+ (channel_props['InitiatorHandle'], foo_handle)
+ assert channel_props['InitiatorID'] == 'foo at bar.com',\
+ channel_props['InitiatorID']
# the message is still there
diff --git a/tests/twisted/text/test-text.py b/tests/twisted/text/test-text.py
index f3a3413..21109fe 100644
--- a/tests/twisted/text/test-text.py
+++ b/tests/twisted/text/test-text.py
@@ -43,20 +43,13 @@ def test(q, bus, conn, stream):
assert 'org.freedesktop.Telepathy.Channel.Interface.ChatState' in \
channel_props.get('Interfaces', ()), \
channel_props.get('Interfaces')
- assert 'org.freedesktop.Telepathy.Channel.FUTURE' in \
- channel_props.get('Interfaces', ()), \
- channel_props.get('Interfaces')
assert channel_props['TargetID'] == jid,\
(channel_props['TargetID'], jid)
-
- future_props = text_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == False
- assert future_props['InitiatorHandle'] == event.args[3],\
- (future_props['InitiatorHandle'], event.args[3])
- assert future_props['InitiatorID'] == jid,\
- (future_props['InitiatorID'], jid)
+ assert channel_props['Requested'] == False
+ assert channel_props['InitiatorHandle'] == event.args[3],\
+ (channel_props['InitiatorHandle'], event.args[3])
+ assert channel_props['InitiatorID'] == jid,\
+ (channel_props['InitiatorID'], jid)
event = q.expect('dbus-signal', signal='Received')
diff --git a/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py b/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
index 634eeb7..04088c0 100644
--- a/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
+++ b/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
@@ -130,14 +130,9 @@ def test(q, bus, conn, stream):
'org.freedesktop.Telepathy.Channel',
dbus_interface='org.freedesktop.DBus.Properties')
assert channel_props['TargetID'] == 'chat at conf.localhost', channel_props
-
- # Exercise FUTURE properties
- future_props = tubes_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == False
- assert future_props['InitiatorID'] == ''
- assert future_props['InitiatorHandle'] == 0
+ assert channel_props['Requested'] == False
+ assert channel_props['InitiatorID'] == ''
+ assert channel_props['InitiatorHandle'] == 0
tubes_self_handle = tubes_chan.GetSelfHandle(
dbus_interface=tp_name_prefix + '.Channel.Interface.Group')
diff --git a/tests/twisted/tubes/test-muc-offer-dbus-tube.py b/tests/twisted/tubes/test-muc-offer-dbus-tube.py
index 7dfcd11..000c2a7 100644
--- a/tests/twisted/tubes/test-muc-offer-dbus-tube.py
+++ b/tests/twisted/tubes/test-muc-offer-dbus-tube.py
@@ -106,6 +106,9 @@ def test(q, bus, conn, stream):
channel_props['Interfaces'], \
channel_props['Interfaces']
assert channel_props['TargetID'] == 'chat at conf.localhost', channel_props
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorID'] == 'test at localhost'
+ assert channel_props['InitiatorHandle'] == conn.GetSelfHandle()
# Exercise Group Properties from spec 0.17.6 (in a basic way)
group_props = tubes_chan.GetAll(
@@ -118,14 +121,6 @@ def test(q, bus, conn, stream):
assert 'RemotePendingMembers' in group_props, group_props
assert 'GroupFlags' in group_props, group_props
- # Exercise FUTURE properties
- future_props = tubes_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorID'] == 'test at localhost'
- assert future_props['InitiatorHandle'] == conn.GetSelfHandle()
-
tubes_self_handle = tubes_chan.GetSelfHandle(
dbus_interface=tp_name_prefix + '.Channel.Interface.Group')
assert group_props['SelfHandle'] == tubes_self_handle
diff --git a/tests/twisted/tubes/test-si-tubes.py b/tests/twisted/tubes/test-si-tubes.py
index 8bee78a..3ef8e6b 100644
--- a/tests/twisted/tubes/test-si-tubes.py
+++ b/tests/twisted/tubes/test-si-tubes.py
@@ -134,10 +134,10 @@ def test(q, bus, conn, stream):
bob_handle
assert emitted_props[tp_name_prefix + '.Channel.TargetID'] == \
'bob at localhost'
- assert emitted_props[tp_name_prefix + '.Channel.FUTURE.Requested'] == True
- assert emitted_props[tp_name_prefix + '.Channel.FUTURE.InitiatorHandle'] \
+ assert emitted_props[tp_name_prefix + '.Channel.Requested'] == True
+ assert emitted_props[tp_name_prefix + '.Channel.InitiatorHandle'] \
== conn.GetSelfHandle()
- assert emitted_props[tp_name_prefix + '.Channel.FUTURE.InitiatorID'] == \
+ assert emitted_props[tp_name_prefix + '.Channel.InitiatorID'] == \
'test at localhost'
properties = conn.GetAll(
@@ -170,13 +170,9 @@ def test(q, bus, conn, stream):
self_handle = conn.GetSelfHandle()
- # Exercise FUTURE properties
- future_props = tubes_chan.GetAll(
- 'org.freedesktop.Telepathy.Channel.FUTURE',
- dbus_interface='org.freedesktop.DBus.Properties')
- assert future_props['Requested'] == True
- assert future_props['InitiatorID'] == 'test at localhost'
- assert future_props['InitiatorHandle'] == self_handle
+ assert channel_props['Requested'] == True
+ assert channel_props['InitiatorID'] == 'test at localhost'
+ assert channel_props['InitiatorHandle'] == self_handle
# Unix socket
path = os.getcwd() + '/stream'
--
1.5.6.5
More information about the Telepathy-commits
mailing list