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 /modules/mail | |
| parent | 8fd93c9042bb30e53ce88303f8a0789a6ca688eb (diff) | |
| parent | 6d5db4c7cd468d424ea8628344c5a1bba6fc3d7c (diff) | |
| download | gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.gz gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.tar.zst gsoc2013-evolution-56a166bb42bd55216a489c0b850ddd6bca2a3cd5.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 11 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.c | 10 | ||||
| -rw-r--r-- | modules/mail/em-composer-prefs.c | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index ad572f1421..9067437a71 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -303,10 +303,11 @@ mail_shell_backend_window_weak_notify_cb (EShell *shell, } static void -mail_shell_backend_window_created_cb (EShell *shell, - GtkWindow *window, - EShellBackend *shell_backend) +mail_shell_backend_window_added_cb (GtkApplication *application, + GtkWindow *window, + EShellBackend *shell_backend) { + EShell *shell = E_SHELL (application); const gchar *backend_name; /* This applies to both the composer and signature editor. */ @@ -397,8 +398,8 @@ mail_shell_backend_constructed (GObject *object) shell_backend); g_signal_connect ( - shell, "window-created", - G_CALLBACK (mail_shell_backend_window_created_cb), + shell, "window-added", + G_CALLBACK (mail_shell_backend_window_added_cb), shell_backend); e_mail_shell_settings_init (shell_backend); diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 30a6756ddf..50525c7c7f 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -983,11 +983,11 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view) folder_name = camel_folder_get_display_name (folder); parent_store = camel_folder_get_parent_store (folder); - num_deleted = folder->summary->deleted_count; - num_junked = folder->summary->junk_count; - num_junked_not_deleted = folder->summary->junk_not_deleted_count; - num_unread = folder->summary->unread_count; - num_visible = folder->summary->visible_count; + num_deleted = camel_folder_summary_get_deleted_count (folder->summary); + num_junked = camel_folder_summary_get_junk_count (folder->summary); + num_junked_not_deleted = camel_folder_summary_get_junk_not_deleted_count (folder->summary); + num_unread = camel_folder_summary_get_unread_count (folder->summary); + num_visible = camel_folder_summary_get_visible_count (folder->summary); buffer = g_string_sized_new (256); uids = e_mail_reader_get_selected_uids (reader); diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 12a521b454..8453b88540 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -547,11 +547,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); - /* The mail shell backend responds to the "window-created" signal + /* The mail shell backend responds to the "window-added" signal * that this triggers and configures it with composer preferences. */ g_signal_connect_swapped ( widget, "editor-created", - G_CALLBACK (e_shell_watch_window), shell); + G_CALLBACK (gtk_application_add_window), shell); /* Express mode does not honor this setting. */ if (!e_shell_get_express_mode (shell)) |