diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-12-22 09:59:16 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-12-22 10:16:21 +0100 |
| commit | c2f15753fd5d3f874f4ef2d06c43bdcfeb0b492e (patch) | |
| tree | 24a5fe87e2e8edc4749fa0a4186939cdcb7b6710 | |
| parent | aa56027c9de02c8db28071548f2c96f059ac0fed (diff) | |
SucceededWithChannel signal is now stable
| -rw-r--r-- | src/request.c | 3 | ||||
| -rw-r--r-- | test/twisted/constants.py | 1 | ||||
| -rw-r--r-- | test/twisted/dispatcher/create-hints.py | 2 | ||||
| -rw-r--r-- | test/twisted/dispatcher/create-text.py | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/request.c b/src/request.c index 5758a4c0..47d53453 100644 --- a/src/request.c +++ b/src/request.c @@ -97,7 +97,6 @@ static void request_iface_init (TpSvcChannelRequestClass *); G_DEFINE_TYPE_WITH_CODE (McdRequest, _mcd_request, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_REQUEST, request_iface_init); - G_IMPLEMENT_INTERFACE (MC_TYPE_SVC_CHANNEL_REQUEST_INTERFACE_HINTS, NULL); G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES, tp_dbus_properties_mixin_iface_init)) @@ -564,7 +563,7 @@ _mcd_request_set_success (McdRequest *self, self->is_complete = TRUE; self->cancellable = FALSE; - mc_svc_channel_request_interface_hints_emit_succeeded_with_channel (self, + tp_svc_channel_request_emit_succeeded_with_channel (self, tp_proxy_get_object_path (tp_channel_borrow_connection (channel)), future_conn_props, tp_proxy_get_object_path (channel), diff --git a/test/twisted/constants.py b/test/twisted/constants.py index 493c5ef5..dbedd44b 100644 --- a/test/twisted/constants.py +++ b/test/twisted/constants.py @@ -178,7 +178,6 @@ AM_IFACE_NOKIA_QUERY = 'com.nokia.AccountManager.Interface.Query' AM_PATH = tp_path_prefix + '/AccountManager' CR = tp_name_prefix + '.ChannelRequest' -CR_IFACE_HINTS = CR + '.Interface.Hints.DRAFT' CDO = tp_name_prefix + '.ChannelDispatchOperation' CD = tp_name_prefix + '.ChannelDispatcher' diff --git a/test/twisted/dispatcher/create-hints.py b/test/twisted/dispatcher/create-hints.py index 814bf66f..9894276a 100644 --- a/test/twisted/dispatcher/create-hints.py +++ b/test/twisted/dispatcher/create-hints.py @@ -177,7 +177,7 @@ def test_channel_creation(q, bus, account, client, conn, q.dbus_return(e.message, signature='') # SucceededWithChannel is fired first - e = q.expect('dbus-signal', path=request_path, interface=cs.CR_IFACE_HINTS, + e = q.expect('dbus-signal', path=request_path, interface=cs.CR, signal='SucceededWithChannel') assertEquals(conn.object_path, e.args[0]) diff --git a/test/twisted/dispatcher/create-text.py b/test/twisted/dispatcher/create-text.py index 12c8d762..0a05f9d0 100644 --- a/test/twisted/dispatcher/create-text.py +++ b/test/twisted/dispatcher/create-text.py @@ -199,7 +199,7 @@ def test_channel_creation(q, bus, account, client, conn, q.dbus_return(e.message, signature='') # SucceededWithChannel is fired first - e = q.expect('dbus-signal', path=request_path, interface=cs.CR_IFACE_HINTS, + e = q.expect('dbus-signal', path=request_path, interface=cs.CR, signal='SucceededWithChannel') assertEquals(conn.object_path, e.args[0]) |