From 3fc0de639b3c1c3dbf91ded59fa365765af7e88e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 28 May 2011 21:42:24 -0400 Subject: 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. --- modules/mail/e-mail-shell-view-actions.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'modules/mail') 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); } -- cgit v1.2.3