diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-02-16 20:14:49 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-02-16 20:14:49 +0800 |
| commit | 94e43758de5e90ff3acf70654a53ddf787495f1b (patch) | |
| tree | 0f7e8bd91d339d92f94221cf61e1623624fdbeba /modules/mail | |
| parent | fd0b59503481461304b8c9818066eb7ce28dfe25 (diff) | |
| download | gsoc2013-evolution-94e43758de5e90ff3acf70654a53ddf787495f1b.tar.gz gsoc2013-evolution-94e43758de5e90ff3acf70654a53ddf787495f1b.tar.zst gsoc2013-evolution-94e43758de5e90ff3acf70654a53ddf787495f1b.zip | |
Bug #638333 - Critical warning when invoking File->New->Mail Folder
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 15 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index c7bba4944a..601b8e0c25 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -108,24 +108,35 @@ action_mail_folder_new_cb (GtkAction *action, { EMFolderTree *folder_tree = NULL; EMailShellSidebar *mail_shell_sidebar; + EMailSession *mail_session; EShellSidebar *shell_sidebar; EShellView *shell_view; const gchar *view_name; /* Take care not to unnecessarily load the mail shell view. */ view_name = e_shell_window_get_active_view (shell_window); - if (g_strcmp0 (view_name, BACKEND_NAME) != 0) + if (g_strcmp0 (view_name, BACKEND_NAME) != 0) { + EShellBackend *mail_backend; + + mail_backend = e_shell_get_backend_by_name (e_shell_window_get_shell (shell_window), BACKEND_NAME); + g_return_if_fail (mail_backend != NULL); + + mail_session = e_mail_backend_get_session (E_MAIL_BACKEND (mail_backend)); + g_return_if_fail (mail_session != NULL); + goto exit; + } shell_view = e_shell_window_get_shell_view (shell_window, view_name); shell_sidebar = e_shell_view_get_shell_sidebar (shell_view); mail_shell_sidebar = E_MAIL_SHELL_SIDEBAR (shell_sidebar); folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); + mail_session = em_folder_tree_get_session (folder_tree); exit: em_folder_utils_create_folder ( - NULL, folder_tree, GTK_WINDOW (shell_window)); + NULL, folder_tree, mail_session, GTK_WINDOW (shell_window)); } static void diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 1665b8e8ce..e0a445abdd 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -394,7 +394,7 @@ action_mail_folder_new_cb (GtkAction *action, g_return_if_fail (folder_info != NULL); em_folder_utils_create_folder ( - folder_info, folder_tree, GTK_WINDOW (shell_window)); + folder_info, folder_tree, em_folder_tree_get_session (folder_tree), GTK_WINDOW (shell_window)); camel_folder_info_free (folder_info); } |