diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 20:48:40 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 20:48:40 +0800 |
| commit | 72e7c137e1ce5f45c93583540b04fc106b2656d1 (patch) | |
| tree | cd677ec06bbbfbe53506e706be9e40497ffa3859 /libempathy-gtk | |
| parent | 8a8ba7a5697c6e5494854c99dc9aa4a7fc7a45bd (diff) | |
| download | gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.gz gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.bz2 gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.lz gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.xz gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.tar.zst gsoc2013-empathy-72e7c137e1ce5f45c93583540b04fc106b2656d1.zip | |
empathy_dispatcher_chat_with_contact_id: get a TpAccount instead of a TpConnection
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 20 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-new-message-dialog.c | 8 |
2 files changed, 10 insertions, 18 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 399f0cc9b..9c6a632bc 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -228,18 +228,11 @@ chat_set_property (GObject *object, } static void -reconnected_connection_ready_cb (TpConnection *connection, - const GError *error, - gpointer user_data) +account_reconnected (EmpathyChat *chat, + TpAccount *account) { - EmpathyChat *chat = user_data; EmpathyChatPriv *priv = GET_PRIV (chat); - if (error != NULL) { - DEBUG ("connection is not ready: %s", error->message); - goto out; - } - DEBUG ("Account reconnected, request a new Text channel"); /* FIXME: Ideally we should ask to handle ourself the channel so we can @@ -248,10 +241,10 @@ reconnected_connection_ready_cb (TpConnection *connection, switch (priv->handle_type) { case TP_HANDLE_TYPE_CONTACT: empathy_dispatcher_chat_with_contact_id ( - connection, priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION); + account, priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION); break; case TP_HANDLE_TYPE_ROOM: - empathy_dispatcher_join_muc (connection, + empathy_dispatcher_join_muc (tp_account_get_connection (account), priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION); break; case TP_HANDLE_TYPE_NONE: @@ -262,7 +255,6 @@ reconnected_connection_ready_cb (TpConnection *connection, break; } -out: g_object_unref (chat); } @@ -289,8 +281,8 @@ chat_new_connection_cb (TpAccount *account, return; g_object_ref (chat); - tp_connection_call_when_ready (connection, reconnected_connection_ready_cb, - chat); + + account_reconnected (chat, account); } static void diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 6cdab4654..a17481437 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -60,17 +60,17 @@ G_DEFINE_TYPE(EmpathyNewMessageDialog, empathy_new_message_dialog, static void empathy_new_message_dialog_response (GtkDialog *dialog, int response_id) { - TpConnection *connection; + TpAccount *account; const gchar *contact_id; if (response_id != GTK_RESPONSE_ACCEPT) goto out; contact_id = empathy_contact_selector_dialog_get_selected ( - EMPATHY_CONTACT_SELECTOR_DIALOG (dialog), &connection, NULL); + EMPATHY_CONTACT_SELECTOR_DIALOG (dialog), NULL, &account); - if (EMP_STR_EMPTY (contact_id) || connection == NULL) goto out; + if (EMP_STR_EMPTY (contact_id) || account == NULL) goto out; - empathy_dispatcher_chat_with_contact_id (connection, contact_id, + empathy_dispatcher_chat_with_contact_id (account, contact_id, gtk_get_current_event_time ()); out: |