diff options
author | Milan Crha <mcrha@redhat.com> | 2014-06-24 18:34:42 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2014-06-24 18:34:42 +0800 |
commit | ffc21b90eed0af55480eddc470053efd85f71f6c (patch) | |
tree | 1fabe0b72a21de10390dc59dda9e72f11913ef59 /mail | |
parent | 4cda728c0947ac35e52d4726e8eefc115c7b30be (diff) | |
download | gsoc2013-evolution-ffc21b90eed0af55480eddc470053efd85f71f6c.tar gsoc2013-evolution-ffc21b90eed0af55480eddc470053efd85f71f6c.tar.gz gsoc2013-evolution-ffc21b90eed0af55480eddc470053efd85f71f6c.tar.bz2 gsoc2013-evolution-ffc21b90eed0af55480eddc470053efd85f71f6c.tar.lz gsoc2013-evolution-ffc21b90eed0af55480eddc470053efd85f71f6c.tar.xz gsoc2013-evolution-ffc21b90eed0af55480eddc470053efd85f71f6c.tar.zst gsoc2013-evolution-ffc21b90eed0af55480eddc470053efd85f71f6c.zip |
Propagate Send/Receive errors to UI
A follow-up change to bug 719379, to propagate errors from Send/Receive
into UI, instead of to the console.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/mail-send-recv.c | 91 | ||||
-rw-r--r-- | mail/mail.error.xml | 7 |
2 files changed, 86 insertions, 12 deletions
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 0bd074b759..2513ade139 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -27,6 +27,9 @@ #include <glib/gi18n.h> #include <shell/e-shell.h> +#include <shell/e-shell-content.h> +#include <shell/e-shell-view.h> +#include <shell/e-shell-window.h> #include <e-util/e-util.h> #include "e-mail-account-store.h" @@ -428,6 +431,75 @@ format_service_name (CamelService *service) return pretty_url; } +static void +report_error_to_ui (CamelService *service, + const gchar *folder_name, + const GError *error) +{ + EShellView *shell_view = NULL; + gchar *tmp = NULL; + const gchar *display_name, *ident; + + g_return_if_fail (CAMEL_IS_SERVICE (service)); + g_return_if_fail (error != NULL); + + if (folder_name) { + tmp = g_strdup_printf ("%s: %s", + camel_service_get_display_name (service), + folder_name); + display_name = tmp; + ident = "mail:no-refresh-folder"; + } else { + display_name = camel_service_get_display_name (service); + ident = "mail:failed-connect"; + } + + if (send_recv_dialog) { + GtkWidget *parent; + + parent = gtk_widget_get_parent (send_recv_dialog); + if (parent && E_IS_SHELL_WINDOW (parent)) { + EShellWindow *shell_window = E_SHELL_WINDOW (parent); + + shell_view = e_shell_window_get_shell_view (shell_window, "mail"); + } + } + + if (!shell_view) { + EShell *shell; + GtkWindow *active_window; + + shell = e_shell_get_default (); + active_window = e_shell_get_active_window (shell); + + if (E_IS_SHELL_WINDOW (active_window)) { + EShellWindow *shell_window = E_SHELL_WINDOW (active_window); + + shell_view = e_shell_window_get_shell_view (shell_window, "mail"); + } + } + + if (shell_view) { + EShellContent *shell_content; + EAlertSink *alert_sink; + EAlert *alert; + + shell_content = e_shell_view_get_shell_content (shell_view); + alert_sink = E_ALERT_SINK (shell_content); + + alert = e_alert_new (ident, display_name, error->message, NULL); + + e_alert_sink_submit_alert (alert_sink, alert); + + g_object_unref (alert); + } else { + /* This may not happen, but just in case... */ + g_warning ("%s: %s '%s': %s\n", G_STRFUNC, ident, display_name, error->message); + } + + g_free (tmp); +} + static send_info_t get_receive_type (CamelService *service) { @@ -1161,21 +1233,18 @@ refresh_folders_exec (struct _refresh_folders_msg *m, if (local_error != NULL) { if (!g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - const gchar *account_name = NULL, *full_name; + CamelStore *store = m->store; + const gchar *full_name; if (folder) { - CamelStore *store = camel_folder_get_parent_store (folder); - - account_name = camel_service_get_display_name (CAMEL_SERVICE (store)); + store = camel_folder_get_parent_store (folder); full_name = camel_folder_get_full_name (folder); - } else + } else { + store = m->store; full_name = (const gchar *) m->folders->pdata[i]; + } - g_warning ( - "Failed to refresh folder '%s%s%s': %s", - account_name ? account_name : "", - account_name ? ": " : "", - full_name, local_error->message); + report_error_to_ui (CAMEL_SERVICE (store), full_name, local_error); } g_clear_error (&local_error); @@ -1250,7 +1319,7 @@ receive_update_got_folderinfo (GObject *source_object, /* XXX Need to hand this off to an EAlertSink. */ } else if (local_error != NULL) { g_warn_if_fail (info == NULL); - g_warning ("%s: %s", G_STRFUNC, local_error->message); + report_error_to_ui (send_info->service, NULL, local_error); g_error_free (local_error); receive_done (send_info); diff --git a/mail/mail.error.xml b/mail/mail.error.xml index 6ff80e929c..c3e12fde92 100644 --- a/mail/mail.error.xml +++ b/mail/mail.error.xml @@ -456,9 +456,14 @@ An mbox account will be created to preserve the old mbox folders. You can delete <button stock="gtk-ok" response="GTK_RESPONSE_OK"/> </error> + <error id="failed-connect" type="warning"> + <_primary>Failed to connect account "{0}".</_primary> + <_secondary>The reported error was "{1}".</_secondary> + </error> + <error id="disconnect" type="warning"> <_primary>Failed to disconnect account "{0}".</_primary> - <_secondary>The reported error was "{0}".</_secondary> + <_secondary>The reported error was "{1}".</_secondary> </error> <error id="folder-unsubscribe" type="warning"> |