diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-04-13 22:30:40 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-06-03 11:00:40 +0800 |
| commit | 3449e5fcc7f9c797fcde7f2a444b1eb7a934cd81 (patch) | |
| tree | ff59febf4ac0c6316ef344ea25cee002088bd314 /mail/em-subscription-editor.c | |
| parent | f78795f4dff8b225d78385c5e23e1cd44ee946ad (diff) | |
| download | gsoc2013-evolution-3449e5fcc7f9c797fcde7f2a444b1eb7a934cd81.tar gsoc2013-evolution-3449e5fcc7f9c797fcde7f2a444b1eb7a934cd81.tar.gz gsoc2013-evolution-3449e5fcc7f9c797fcde7f2a444b1eb7a934cd81.tar.bz2 gsoc2013-evolution-3449e5fcc7f9c797fcde7f2a444b1eb7a934cd81.tar.lz gsoc2013-evolution-3449e5fcc7f9c797fcde7f2a444b1eb7a934cd81.tar.xz gsoc2013-evolution-3449e5fcc7f9c797fcde7f2a444b1eb7a934cd81.tar.zst gsoc2013-evolution-3449e5fcc7f9c797fcde7f2a444b1eb7a934cd81.zip | |
Adapt mail to the new ESource API.
Diffstat (limited to 'mail/em-subscription-editor.c')
| -rw-r--r-- | mail/em-subscription-editor.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c index f695a88d87..8221115c46 100644 --- a/mail/em-subscription-editor.c +++ b/mail/em-subscription-editor.c @@ -25,7 +25,6 @@ #include <string.h> #include <glib/gi18n-lib.h> -#include <libemail-utils/e-account-utils.h> #include <libemail-utils/mail-mt.h> #include <libemail-engine/mail-tools.h> #include <libemail-engine/mail-ops.h> @@ -1555,19 +1554,24 @@ subscription_editor_constructed (GObject *object) /* Pick an initial store based on the default mail account, if * one wasn't already given in em_subscription_editor_new(). */ if (editor->priv->initial_store == NULL) { - EAccount *account; + ESource *source; + ESourceRegistry *registry; CamelService *service; EMailSession *session; - account = e_get_default_account (); - session = em_subscription_editor_get_session (editor); + registry = e_mail_session_get_registry (session); + + source = e_source_registry_ref_default_mail_account (registry); service = camel_session_get_service ( - CAMEL_SESSION (session), account->uid); + CAMEL_SESSION (session), + e_source_get_uid (source)); if (CAMEL_IS_SUBSCRIBABLE (service)) editor->priv->initial_store = g_object_ref (service); + + g_object_unref (source); } /* Chain up to parent's constructed() method. */ |