aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-29 09:42:24 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:21 +0800
commitb7a86ea9574476a3cfb363635684a11d8a5f6fd1 (patch)
treedd27fb83c0a1324937046f53623269c2c913ef51 /modules/mail
parent0c205a55ed4fc673037e2dffdc0e05f191eeb193 (diff)
downloadgsoc2013-evolution-b7a86ea9574476a3cfb363635684a11d8a5f6fd1.tar
gsoc2013-evolution-b7a86ea9574476a3cfb363635684a11d8a5f6fd1.tar.gz
gsoc2013-evolution-b7a86ea9574476a3cfb363635684a11d8a5f6fd1.tar.bz2
gsoc2013-evolution-b7a86ea9574476a3cfb363635684a11d8a5f6fd1.tar.lz
gsoc2013-evolution-b7a86ea9574476a3cfb363635684a11d8a5f6fd1.tar.xz
gsoc2013-evolution-b7a86ea9574476a3cfb363635684a11d8a5f6fd1.tar.zst
gsoc2013-evolution-b7a86ea9574476a3cfb363635684a11d8a5f6fd1.zip
EMSubscriptionEditor: Manage stores, not accounts.
We'll query the accounts to get display names for the combo box, but that's it. Use CamelStores instead.
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-view-actions.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index a9fd726892..e396184bc0 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -1053,6 +1053,7 @@ action_mail_tools_subscriptions_cb (GtkAction *action,
EMFolderTree *folder_tree;
EAccount *account;
GtkWidget *dialog;
+ CamelStore *store = NULL;
shell_view = E_SHELL_VIEW (mail_shell_view);
shell_window = e_shell_view_get_shell_window (shell_view);
@@ -1065,9 +1066,18 @@ action_mail_tools_subscriptions_cb (GtkAction *action,
backend = E_MAIL_BACKEND (shell_backend);
session = e_mail_backend_get_session (backend);
+ if (account != NULL) {
+ CamelService *service;
+
+ service = camel_session_get_service (
+ CAMEL_SESSION (session), account->uid);
+ if (service != NULL)
+ store = CAMEL_STORE (service);
+ }
+
dialog = em_subscription_editor_new (
GTK_WINDOW (shell_window),
- CAMEL_SESSION (session), account);
+ CAMEL_SESSION (session), store);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}