diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-10 18:50:18 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-10 18:50:18 +0800 |
| commit | 56a166bb42bd55216a489c0b850ddd6bca2a3cd5 (patch) | |
| tree | 3f87cf07fd6098ab2700c56d71d97686c5e5bc71 /mail/e-mail-backend.c | |
| parent | 8fd93c9042bb30e53ce88303f8a0789a6ca688eb (diff) | |
| parent | 6d5db4c7cd468d424ea8628344c5a1bba6fc3d7c (diff) | |
| download | gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.gz gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.bz2 gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.lz gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.xz gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.zst gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'mail/e-mail-backend.c')
| -rw-r--r-- | mail/e-mail-backend.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 5768934b1a..cb91339503 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -349,7 +349,7 @@ mail_backend_quit_requested_cb (EShell *shell, if (folder == NULL) return; - if (folder->summary->visible_count == 0) + if (camel_folder_summary_get_visible_count (folder->summary) == 0) return; response = e_alert_run_dialog_for_args ( @@ -632,10 +632,13 @@ mail_backend_job_finished_cb (CamelSession *session, } else if (error != NULL) { EShell *shell; + GtkApplication *application; GList *list, *iter; shell = e_shell_backend_get_shell (shell_backend); - list = e_shell_get_watched_windows (shell); + + application = GTK_APPLICATION (shell); + list = gtk_application_get_windows (application); /* Submit the error to an appropriate EAlertSink. */ for (iter = list; iter != NULL; iter = g_list_next (iter)) { @@ -917,6 +920,7 @@ e_mail_backend_submit_alert (EMailBackend *backend, EShellContent *shell_content; EShellWindow *shell_window = NULL; EShellBackendClass *class; + GtkApplication *application; GList *list, *iter; va_list va; @@ -931,8 +935,10 @@ e_mail_backend_submit_alert (EMailBackend *backend, shell_backend = E_SHELL_BACKEND (backend); shell = e_shell_backend_get_shell (shell_backend); + application = GTK_APPLICATION (shell); + list = gtk_application_get_windows (application); + /* Find the most recently used EShellWindow. */ - list = e_shell_get_watched_windows (shell); for (iter = list; iter != NULL; iter = g_list_next (iter)) { if (E_IS_SHELL_WINDOW (iter->data)) { shell_window = E_SHELL_WINDOW (iter->data); |