diff options
author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-07-04 11:17:24 +0200 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-07-04 17:25:15 +0200 |
commit | 4eae5a87246008df6b6e184a727713c283b18598 (patch) | |
tree | f0b5b94128158f4d90fe83db3cf235cab4988a3a | |
parent | d9b0a90777b544b2d6db688b403ae14c2defd99a (diff) | |
download | telepathy-logger-4eae5a87246008df6b6e184a727713c283b18598.tar.gz |
No need to prepare TP_CONNECTION_FEATURE_CORE
TpBaseClient already ensure that before handing the channel
-rw-r--r-- | telepathy-logger/call-channel.c | 13 | ||||
-rw-r--r-- | telepathy-logger/text-channel.c | 32 |
2 files changed, 0 insertions, 45 deletions
diff --git a/telepathy-logger/call-channel.c b/telepathy-logger/call-channel.c index 29fc57a..4be0075 100644 --- a/telepathy-logger/call-channel.c +++ b/telepathy-logger/call-channel.c @@ -80,18 +80,6 @@ proxy_prepared_cb (GObject *source, static void -pendingproc_prepare_tp_connection (TplActionChain *ctx, - gpointer user_data) -{ - TplCallChannel *chan = _tpl_action_chain_get_object (ctx); - TpConnection *conn = tp_channel_borrow_connection (TP_CHANNEL (chan)); - GQuark conn_features[] = { TP_CONNECTION_FEATURE_CORE, 0 }; - - tp_proxy_prepare_async (conn, conn_features, proxy_prepared_cb, ctx); -} - - -static void pendingproc_prepare_tp_channel (TplActionChain *ctx, gpointer user_data) { @@ -370,7 +358,6 @@ tpl_call_channel_prepare_async (TplChannel *chan, actions = _tpl_action_chain_new_async (G_OBJECT (chan), cb, user_data); _tpl_action_chain_append (actions, pendingproc_connect_signals, NULL); - _tpl_action_chain_append (actions, pendingproc_prepare_tp_connection, NULL); _tpl_action_chain_append (actions, pendingproc_prepare_tp_channel, NULL); _tpl_action_chain_append (actions, pendingproc_get_contacts, NULL); diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c index 6307f9e..40b1f25 100644 --- a/telepathy-logger/text-channel.c +++ b/telepathy-logger/text-channel.c @@ -61,37 +61,6 @@ G_DEFINE_TYPE_WITH_CODE (TplTextChannel, _tpl_text_channel, static void -connection_prepared_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - TplActionChain *ctx = user_data; - GError *error = NULL; - - if (!tp_proxy_prepare_finish (source, result, &error)) - { - _tpl_action_chain_terminate (ctx, error); - g_error_free (error); - return; - } - - _tpl_action_chain_continue (ctx); -} - - -static void -pendingproc_prepare_tp_connection (TplActionChain *ctx, - gpointer user_data) -{ - TplChannel *chan = _tpl_action_chain_get_object (ctx); - TpConnection *conn = tp_channel_borrow_connection (TP_CHANNEL (chan)); - GQuark conn_features[] = { TP_CONNECTION_FEATURE_CORE, 0 }; - - tp_proxy_prepare_async (conn, conn_features, connection_prepared_cb, ctx); -} - - -static void channel_prepared_cb (GObject *source, GAsyncResult *result, gpointer ctx) @@ -767,7 +736,6 @@ tpl_text_channel_prepare_async (TplChannel *chan, TplActionChain *actions; actions = _tpl_action_chain_new_async (G_OBJECT (chan), cb, user_data); - _tpl_action_chain_append (actions, pendingproc_prepare_tp_connection, NULL); _tpl_action_chain_append (actions, pendingproc_prepare_tp_text_channel, NULL); _tpl_action_chain_append (actions, pendingproc_get_my_contact, NULL); _tpl_action_chain_append (actions, pendingproc_get_remote_contact, NULL); |