aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-20 02:56:17 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:17 +0800
commit53feeabf5d9353e72bd5680e1e07d0b721cc8822 (patch)
treecc5c4e42285de7e9f823c563451bb4bb3f7ef89d /modules
parent32a9a11e70445a1e67cf164282f6a8fd5c3da22e (diff)
downloadgsoc2013-evolution-53feeabf5d9353e72bd5680e1e07d0b721cc8822.tar
gsoc2013-evolution-53feeabf5d9353e72bd5680e1e07d0b721cc8822.tar.gz
gsoc2013-evolution-53feeabf5d9353e72bd5680e1e07d0b721cc8822.tar.bz2
gsoc2013-evolution-53feeabf5d9353e72bd5680e1e07d0b721cc8822.tar.lz
gsoc2013-evolution-53feeabf5d9353e72bd5680e1e07d0b721cc8822.tar.xz
gsoc2013-evolution-53feeabf5d9353e72bd5680e1e07d0b721cc8822.tar.zst
gsoc2013-evolution-53feeabf5d9353e72bd5680e1e07d0b721cc8822.zip
Remove mail_remove_folder().
Use e_mail_folder_remove() instead.
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/e-mail-shell-view-actions.c11
-rw-r--r--modules/mail/e-mail-shell-view-private.h1
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"