diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-29 09:42:24 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-29 10:18:36 +0800 |
| commit | 3fc0de639b3c1c3dbf91ded59fa365765af7e88e (patch) | |
| tree | f1049cf4b8f5d8255a419771580f1cb0f4ede085 /modules/mail | |
| parent | 4fe800226b66097f3f7514f66b3d1e4761c4424f (diff) | |
| download | gsoc2013-evolution-3fc0de639b3c1c3dbf91ded59fa365765af7e88e.tar gsoc2013-evolution-3fc0de639b3c1c3dbf91ded59fa365765af7e88e.tar.gz gsoc2013-evolution-3fc0de639b3c1c3dbf91ded59fa365765af7e88e.tar.bz2 gsoc2013-evolution-3fc0de639b3c1c3dbf91ded59fa365765af7e88e.tar.lz gsoc2013-evolution-3fc0de639b3c1c3dbf91ded59fa365765af7e88e.tar.xz gsoc2013-evolution-3fc0de639b3c1c3dbf91ded59fa365765af7e88e.tar.zst gsoc2013-evolution-3fc0de639b3c1c3dbf91ded59fa365765af7e88e.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.c | 12 |
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); } |