diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-20 02:56:17 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-21 01:14:53 +0800 |
| commit | 86c9c4d793b3f9eff93fe00ad579427f254c5882 (patch) | |
| tree | dd3ada63e738ac124789b64421728e6f32dd7144 /modules/mail | |
| parent | 0c790b10190c2cff5fdb7cc1b25dc2a41dedd707 (diff) | |
| download | gsoc2013-evolution-86c9c4d793b3f9eff93fe00ad579427f254c5882.tar gsoc2013-evolution-86c9c4d793b3f9eff93fe00ad579427f254c5882.tar.gz gsoc2013-evolution-86c9c4d793b3f9eff93fe00ad579427f254c5882.tar.bz2 gsoc2013-evolution-86c9c4d793b3f9eff93fe00ad579427f254c5882.tar.lz gsoc2013-evolution-86c9c4d793b3f9eff93fe00ad579427f254c5882.tar.xz gsoc2013-evolution-86c9c4d793b3f9eff93fe00ad579427f254c5882.tar.zst gsoc2013-evolution-86c9c4d793b3f9eff93fe00ad579427f254c5882.zip | |
Remove mail_remove_folder().
Use e_mail_folder_remove() instead.
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 11 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.h | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index dcef6afe74..90096393e3 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -278,22 +278,21 @@ static void action_mail_folder_delete_cb (GtkAction *action, EMailShellView *mail_shell_view) { + EMailShellContent *mail_shell_content; EMailShellSidebar *mail_shell_sidebar; - EShellBackend *shell_backend; - EShellView *shell_view; + EMailView *mail_view; EMFolderTree *folder_tree; CamelFolder *folder; - shell_view = E_SHELL_VIEW (mail_shell_view); - shell_backend = e_shell_view_get_shell_backend (shell_view); + mail_shell_content = mail_shell_view->priv->mail_shell_content; + mail_view = e_mail_shell_content_get_mail_view (mail_shell_content); mail_shell_sidebar = mail_shell_view->priv->mail_shell_sidebar; folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); folder = em_folder_tree_get_selected_folder (folder_tree); g_return_if_fail (folder != NULL); - em_folder_utils_delete_folder ( - E_MAIL_BACKEND (shell_backend), folder); + e_mail_reader_delete_folder (E_MAIL_READER (mail_view), folder); } static void diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index 15bcf8ccf3..9bd276db1d 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -43,6 +43,7 @@ #include "e-mail-label-list-store.h" #include "e-mail-local.h" #include "e-mail-reader.h" +#include "e-mail-reader-utils.h" #include "e-mail-session.h" #include "e-mail-session-utils.h" #include "e-mail-sidebar.h" |