diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-06-05 11:39:43 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-06-05 11:47:54 +0200 |
| commit | b511e3ec078117fb8fdc64a8f0a78813e2813002 (patch) | |
| tree | 1e225b14956602cec22b6c97b0fa1c5ec3598645 /tests/lib/simple-conn.c | |
| parent | a42bb29b1e79ae27e681b0dab3219227d67746ac (diff) | |
| parent | 1fea0da192332a8856e01b62a0d6c30a420220d4 (diff) | |
Merge branch 'master' into next
Conflicts:
examples/cm/call/conn.c
examples/cm/channelspecific/conn.c
examples/cm/channelspecific/room.c
examples/cm/contactlist/conn.c
examples/cm/echo-message-parts/conn.c
examples/cm/extended/conn.c
telepathy-glib/base-connection.c
telepathy-glib/base-connection.h
telepathy-glib/base-contact-list.c
telepathy-glib/contact-list-channel.c
telepathy-glib/presence-mixin.c
tests/dbus/channel-request.c
tests/dbus/contacts-slow-path.c
tests/lib/bug-19101-conn.c
tests/lib/bug16307-conn.c
tests/lib/echo-conn.c
tests/lib/simple-channel-request.c
tests/lib/simple-conn.c
tests/lib/textchan-group.c
Diffstat (limited to 'tests/lib/simple-conn.c')
| -rw-r--r-- | tests/lib/simple-conn.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/tests/lib/simple-conn.c b/tests/lib/simple-conn.c index 60cd35666..bcd3b7681 100644 --- a/tests/lib/simple-conn.c +++ b/tests/lib/simple-conn.c @@ -77,12 +77,8 @@ get_property (GObject *object, break; case PROP_DBUS_STATUS: { - guint32 status = TP_BASE_CONNECTION (self)->status; - - if (status == TP_INTERNAL_CONNECTION_STATUS_NEW) - g_value_set_uint (value, TP_CONNECTION_STATUS_DISCONNECTED); - else - g_value_set_uint (value, status); + g_value_set_uint (value, + tp_base_connection_get_status (TP_BASE_CONNECTION (self))); } break; default: @@ -201,11 +197,13 @@ pretend_connected (gpointer data) TpBaseConnection *conn = (TpBaseConnection *) self; TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_CONTACT); + TpHandle self_handle; - tp_base_connection_set_self_handle (conn, - tp_handle_ensure (contact_repo, self->priv->account, NULL, NULL)); + self_handle = tp_handle_ensure (contact_repo, self->priv->account, + NULL, NULL); + tp_base_connection_set_self_handle (conn, self_handle); - if (conn->status == TP_CONNECTION_STATUS_CONNECTING) + if (tp_base_connection_get_status (conn) == TP_CONNECTION_STATUS_CONNECTING) { tp_base_connection_change_status (conn, TP_CONNECTION_STATUS_CONNECTED, TP_CONNECTION_STATUS_REASON_REQUESTED); @@ -352,8 +350,8 @@ tp_tests_simple_connection_ensure_text_chan (TpTestsSimpleConnection *self, } else { - chan_path = g_strdup_printf ("%s/Channel%u", base_conn->object_path, - count++); + chan_path = g_strdup_printf ("%s/Channel%u", + tp_base_connection_get_object_path (base_conn), count++); chan = TP_TESTS_TEXT_CHANNEL_NULL ( tp_tests_object_new_static_class ( @@ -397,7 +395,7 @@ tp_tests_simple_connection_ensure_room_list_chan (TpTestsSimpleConnection *self, else { chan_path = g_strdup_printf ("%s/RoomListChannel", - base_conn->object_path); + tp_base_connection_get_object_path (base_conn)); self->priv->room_list_chan = TP_TESTS_ROOM_LIST_CHAN ( tp_tests_object_new_static_class ( |