From b499944f633b2c8b5efd7c19b27399520c46ae66 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 24 May 2011 16:23:22 +0100 Subject: empathy_dispatcher_chat_with_contact_id(): add optional cb Conflicts: libempathy-gtk/empathy-individual-menu.c libempathy-gtk/empathy-new-message-dialog.c libempathy/empathy-dispatcher.c libempathy/empathy-dispatcher.h src/empathy-chat-manager.c src/empathy-chat-window.c --- libempathy-gtk/empathy-chat.c | 6 ++++-- libempathy-gtk/empathy-individual-menu.c | 3 ++- libempathy-gtk/empathy-new-message-dialog.c | 6 ++++-- libempathy/empathy-auth-factory.c | 4 +--- libempathy/empathy-request-util.c | 26 ++++++++++++++++++-------- libempathy/empathy-request-util.h | 10 +++++++--- src/empathy-chat-manager.c | 6 ++++-- src/empathy-chat-window.c | 4 +++- 8 files changed, 43 insertions(+), 22 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 032dd2464..cf01632b4 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -275,11 +275,13 @@ account_reconnected (EmpathyChat *chat, if (priv->sms_channel) empathy_sms_contact_id ( account, priv->id, - TP_USER_ACTION_TIME_NOT_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION, + NULL, NULL); else empathy_chat_with_contact_id ( account, priv->id, - TP_USER_ACTION_TIME_NOT_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION, + NULL, NULL); break; case TP_HANDLE_TYPE_ROOM: empathy_join_muc (account, priv->id, diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 745474d84..1a3dbb7e1 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -786,7 +786,8 @@ empathy_individual_sms_menu_item_activated (GtkMenuItem *item, empathy_sms_contact_id ( empathy_contact_get_account (contact), empathy_contact_get_id (contact), - empathy_get_current_action_time ()); + empathy_get_current_action_time (), + NULL, NULL); } GtkWidget * diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 1c4bbaad5..40c25974c 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -80,12 +80,14 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id) { case EMP_NEW_MESSAGE_TEXT: empathy_chat_with_contact_id (account, contact_id, - empathy_get_current_action_time ()); + empathy_get_current_action_time (), + NULL, NULL); break; case EMP_NEW_MESSAGE_SMS: empathy_sms_contact_id (account, contact_id, - empathy_get_current_action_time ()); + empathy_get_current_action_time (), + NULL, NULL); break; default: diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index 56b3b73eb..069f60756 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -20,9 +20,7 @@ #include "empathy-auth-factory.h" -#include -#include -#include +#include #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include "empathy-debug.h" diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c index 409fdf54a..6b53dab9a 100644 --- a/libempathy/empathy-request-util.c +++ b/libempathy/empathy-request-util.c @@ -40,7 +40,7 @@ empathy_chat_with_contact (EmpathyContact *contact, { empathy_chat_with_contact_id ( empathy_contact_get_account (contact), empathy_contact_get_id (contact), - timestamp); + timestamp, NULL, NULL); } static void @@ -63,7 +63,9 @@ create_text_channel (TpAccount *account, TpHandleType target_handle_type, const gchar *target_id, gboolean sms_channel, - gint64 timestamp) + gint64 timestamp, + GAsyncReadyCallback callback, + gpointer user_data) { GHashTable *request; TpAccountChannelRequest *req; @@ -83,19 +85,23 @@ create_text_channel (TpAccount *account, tp_account_channel_request_set_delegate_to_preferred_handler (req, TRUE); tp_account_channel_request_ensure_channel_async (req, EMPATHY_CHAT_BUS_NAME, - NULL, ensure_text_channel_cb, NULL); + NULL, callback ? callback : ensure_text_channel_cb, user_data); g_hash_table_unref (request); g_object_unref (req); } +/* @callback is optional, but if it's provided, it should call the right + * _finish() func that we call in ensure_text_channel_cb() */ void empathy_chat_with_contact_id (TpAccount *account, const gchar *contact_id, - gint64 timestamp) + gint64 timestamp, + GAsyncReadyCallback callback, + gpointer user_data) { create_text_channel (account, TP_HANDLE_TYPE_CONTACT, - contact_id, FALSE, timestamp); + contact_id, FALSE, timestamp, callback, user_data); } void @@ -104,14 +110,18 @@ empathy_join_muc (TpAccount *account, gint64 timestamp) { create_text_channel (account, TP_HANDLE_TYPE_ROOM, - room_name, FALSE, timestamp); + room_name, FALSE, timestamp, NULL, NULL); } +/* @callback is optional, but if it's provided, it should call the right + * _finish() func that we call in ensure_text_channel_cb() */ void empathy_sms_contact_id (TpAccount *account, const gchar *contact_id, - gint64 timestamp) + gint64 timestamp, + GAsyncReadyCallback callback, + gpointer user_data) { create_text_channel (account, TP_HANDLE_TYPE_CONTACT, - contact_id, TRUE, timestamp); + contact_id, TRUE, timestamp, callback, user_data); } diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h index 70a607e73..6781b72d4 100644 --- a/libempathy/empathy-request-util.h +++ b/libempathy/empathy-request-util.h @@ -45,9 +45,11 @@ G_BEGIN_DECLS /* Requesting 1 to 1 text channels */ void empathy_chat_with_contact_id (TpAccount *account, const gchar *contact_id, - gint64 timestamp); + gint64 timestamp, + GAsyncReadyCallback callback, + gpointer user_data); -void empathy_chat_with_contact (EmpathyContact *contact, +void empathy_chat_with_contact (EmpathyContact *contact, gint64 timestamp); /* Request a muc channel */ @@ -58,7 +60,9 @@ void empathy_join_muc (TpAccount *account, /* Request a sms channel */ void empathy_sms_contact_id (TpAccount *account, const gchar *contact_id, - gint64 timestamp); + gint64 timestamp, + GAsyncReadyCallback callback, + gpointer user_data); G_END_DECLS diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 0e1745edb..5f19159c5 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -448,9 +448,11 @@ empathy_chat_manager_undo_closed_chat (EmpathyChatManager *self, if (data->room) empathy_join_muc (data->account, data->id, timestamp); else if (data->sms) - empathy_sms_contact_id (data->account, data->id, timestamp); + empathy_sms_contact_id (data->account, data->id, timestamp, + NULL, NULL); else - empathy_chat_with_contact_id (data->account, data->id, timestamp); + empathy_chat_with_contact_id (data->account, data->id, timestamp, + NULL, NULL); g_signal_emit (self, signals[CLOSED_CHATS_CHANGED], 0, g_queue_get_length (priv->closed_queue)); diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 97ed1b9de..a84eef7a0 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -1866,7 +1866,9 @@ chat_window_drag_data_received (GtkWidget *widget, if (!chat) { empathy_chat_with_contact_id ( - account, contact_id, empathy_get_current_action_time ()); + account, contact_id, + empathy_get_current_action_time (), + NULL, NULL); g_strfreev (strv); return; -- cgit v1.2.3 From 8f1fe631f8046ddeb0bd48d880176ed1f2048be9 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 24 May 2011 16:28:03 +0100 Subject: NewMessageDialog: show an error if starting the channel fails Conflicts: libempathy-gtk/empathy-new-message-dialog.c --- libempathy-gtk/empathy-new-message-dialog.c | 79 ++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 40c25974c..999f34838 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -63,6 +63,81 @@ enum EMP_NEW_MESSAGE_SMS, }; +static const gchar * +get_error_display_message (GError *error) +{ + if (error->domain != TP_ERROR) + goto out; + + switch (error->code) + { + case TP_ERROR_NETWORK_ERROR: + return _("Network error"); + case TP_ERROR_OFFLINE: + return _("The contact is offline"); + case TP_ERROR_INVALID_HANDLE: + return _("The specified contact is either invalid or unknown"); + case TP_ERROR_NOT_CAPABLE: + return _("The contact does not support this kind of conversation"); + case TP_ERROR_NOT_IMPLEMENTED: + return _("The requested functionality is not implemented " + "for this protocol"); + case TP_ERROR_INVALID_ARGUMENT: + /* Not very user friendly to say 'invalid arguments' */ + break; + case TP_ERROR_NOT_AVAILABLE: + return _("Could not start a conversation with the given contact"); + case TP_ERROR_CHANNEL_BANNED: + return _("You are banned from this channel"); + case TP_ERROR_CHANNEL_FULL: + return _("This channel is full"); + case TP_ERROR_CHANNEL_INVITE_ONLY: + return _("You must be invited to join this channel"); + case TP_ERROR_DISCONNECTED: + return _("Can't proceed while disconnected"); + case TP_ERROR_PERMISSION_DENIED: + return _("Permission denied"); + default: + DEBUG ("Unhandled error code: %d", error->code); + } + +out: + return _("There was an error starting the conversation"); +} + +static void +show_chat_error (GError *error) +{ + GtkWidget *dialog; + + dialog = gtk_message_dialog_new (NULL, 0, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, + "%s", + get_error_display_message (error)); + + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + dialog); + + gtk_widget_show (dialog); +} + +static void +ensure_text_channel_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + GError *error = NULL; + + if (!tp_account_channel_request_ensure_channel_finish ( + TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error)) + { + DEBUG ("Failed to ensure text channel: %s", error->message); + show_chat_error (error); + g_error_free (error); + } +} + static void empathy_new_message_dialog_response (GtkDialog *dialog, int response_id) { @@ -81,13 +156,13 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id) case EMP_NEW_MESSAGE_TEXT: empathy_chat_with_contact_id (account, contact_id, empathy_get_current_action_time (), - NULL, NULL); + ensure_text_channel_cb, NULL); break; case EMP_NEW_MESSAGE_SMS: empathy_sms_contact_id (account, contact_id, empathy_get_current_action_time (), - NULL, NULL); + ensure_text_channel_cb, NULL); break; default: -- cgit v1.2.3 From 16e0d5a45bb1e11d57c4d5e512f021ebb6d2da12 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Wed, 25 May 2011 09:56:23 +0100 Subject: Set a parent for the error dialog Conflicts: libempathy-gtk/empathy-new-message-dialog.c --- libempathy-gtk/empathy-new-message-dialog.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 999f34838..027ef8721 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -106,11 +106,12 @@ out: } static void -show_chat_error (GError *error) +show_chat_error (GError *error, + GtkWindow *parent) { GtkWidget *dialog; - dialog = gtk_message_dialog_new (NULL, 0, + dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", get_error_display_message (error)); @@ -133,7 +134,7 @@ ensure_text_channel_cb (GObject *source, TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error)) { DEBUG ("Failed to ensure text channel: %s", error->message); - show_chat_error (error); + show_chat_error (error, user_data); g_error_free (error); } } @@ -156,13 +157,15 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id) case EMP_NEW_MESSAGE_TEXT: empathy_chat_with_contact_id (account, contact_id, empathy_get_current_action_time (), - ensure_text_channel_cb, NULL); + ensure_text_channel_cb, + gtk_widget_get_parent_window (GTK_WIDGET (dialog))); break; case EMP_NEW_MESSAGE_SMS: empathy_sms_contact_id (account, contact_id, empathy_get_current_action_time (), - ensure_text_channel_cb, NULL); + ensure_text_channel_cb, + gtk_widget_get_parent_window (GTK_WIDGET (dialog))); break; default: -- cgit v1.2.3