Synced some sources from telepathy-glib/tests/lib/.
const gchar *account)
{
TpTestsBackendPrivate *priv = self->priv;
+ TpSimpleClientFactory *factory;
AccountData *data;
gchar *conn_path;
GError *error = NULL;
NULL, &conn_path, &error);
g_assert_no_error (error);
- data->client_conn = tp_connection_new (priv->daemon, NULL, conn_path,
- &error);
+ factory = tp_proxy_get_factory (priv->client_am);
+ data->client_conn = tp_simple_client_factory_ensure_connection (factory,
+ conn_path, NULL, &error);
g_assert_no_error (error);
/* Create an account */
TpHandleSet *handles;
guint i;
- g_assert_cmpint (self->priv->conn->status, ==,
- TP_INTERNAL_CONNECTION_STATUS_NEW);
+ g_assert_cmpint (tp_base_connection_get_status (self->priv->conn), ==,
+ TP_CONNECTION_STATUS_DISCONNECTED);
+ g_assert (!tp_base_connection_is_destroyed (self->priv->conn));
handles = tp_handle_set_new (self->priv->contact_repo);
for (i = 0; i < n_members; i++)
{
TpBaseConnection *base = TP_BASE_CONNECTION (object);
- if (base->status != TP_CONNECTION_STATUS_CONNECTED)
- return FALSE;
-
- return TRUE;
+ return tp_base_connection_check_connected (base, NULL);
}
static GHashTable *
TpBaseConnection *base_conn = TP_BASE_CONNECTION (object);
TpTestsContactsConnectionPresenceStatusIndex index = status->index;
const gchar *message = "";
+ TpHandle self_handle;
if (status->optional_arguments != NULL)
{
message = "";
}
+ self_handle = tp_base_connection_get_self_handle (base_conn);
tp_tests_contacts_connection_change_presences (TP_TESTS_CONTACTS_CONNECTION (object),
- 1, &(base_conn->self_handle), &index, &message);
+ 1, &self_handle, &index, &message);
return TRUE;
}
}
else
{
- 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:
TpBaseConnection *conn = (TpBaseConnection *) self;
TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (conn,
TP_HANDLE_TYPE_CONTACT);
+ TpHandle self_handle;
- conn->self_handle = tp_handle_ensure (contact_repo, self->priv->account,
+ 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);
}
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 (
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 (
return;
}
- tp_svc_connection_return_from_get_self_handle (context, base->self_handle);
+ tp_svc_connection_return_from_get_self_handle (context,
+ tp_base_connection_get_self_handle (base));
g_signal_emit (self, signals[SIGNAL_GOT_SELF_HANDLE], 0);
}
g_value_set_boolean (value, TRUE);
break;
case PROP_INITIATOR_HANDLE:
- g_value_set_uint (value, self->priv->conn->self_handle);
+ g_value_set_uint (value, tp_base_connection_get_self_handle (
+ self->priv->conn));
break;
case PROP_INITIATOR_ID:
{
self->priv->conn, TP_HANDLE_TYPE_CONTACT);
g_value_set_string (value,
- tp_handle_inspect (contact_repo, self->priv->conn->self_handle));
+ tp_handle_inspect (contact_repo,
+ tp_base_connection_get_self_handle (self->priv->conn)));
}
break;
case PROP_INTERFACES:
TpConnection **client_conn)
{
TpDBusDaemon *dbus;
+ TpSimpleClientFactory *factory;
gchar *name;
gchar *conn_path;
GError *error = NULL;
g_assert (client_conn != NULL);
dbus = tp_tests_dbus_daemon_dup_or_die ();
+ factory = (TpSimpleClientFactory *) tp_automatic_client_factory_new (dbus);
*service_conn = tp_tests_object_new_static_class (
conn_type,
&name, &conn_path, &error));
g_assert_no_error (error);
- *client_conn = tp_connection_new (dbus, name, conn_path,
- &error);
+ *client_conn = tp_simple_client_factory_ensure_connection (factory,
+ conn_path, NULL, &error);
g_assert (*client_conn != NULL);
g_assert_no_error (error);
g_free (conn_path);
g_object_unref (dbus);
+ g_object_unref (factory);
}
void