diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-09-26 23:45:11 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-09-26 23:45:11 +0800 |
| commit | f615000f6c1f549db7ea29ff8a3a011b1bd850cc (patch) | |
| tree | 0555f6bdd6469dbfcdc77bd2ba7ac56aaeded849 /mail/e-mail-backend.c | |
| parent | 8c426446929d94c390c550177695a9f055f779ae (diff) | |
| download | gsoc2013-evolution-f615000f6c1f549db7ea29ff8a3a011b1bd850cc.tar.gz gsoc2013-evolution-f615000f6c1f549db7ea29ff8a3a011b1bd850cc.tar.zst gsoc2013-evolution-f615000f6c1f549db7ea29ff8a3a011b1bd850cc.zip | |
EMFolderTreeModel: Don't use parameters in "get_default" functions.
Drop EMFolderTreeModel's "session" property now that it has a "backend"
property and call em_folder_tree_model_set_backend() where we used to
call em_folder_tree_model_set_session().
The session can still be obtained through e_mail_backend_get_session().
Diffstat (limited to 'mail/e-mail-backend.c')
| -rw-r--r-- | mail/e-mail-backend.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index ff37b7a93a..0c6590805f 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -572,7 +572,7 @@ mail_backend_folder_changed_cb (MailFolderCache *folder_cache, folder_type = (flags & CAMEL_FOLDER_TYPE_MASK); target->is_inbox = (folder_type == CAMEL_FOLDER_TYPE_INBOX); - model = em_folder_tree_model_get_default (mail_backend); + model = em_folder_tree_model_get_default (); target->display_name = em_folder_tree_model_get_folder_name ( model, store, folder_name); @@ -773,8 +773,12 @@ mail_backend_constructed (GObject *object) e_account_combo_box_set_session (CAMEL_SESSION (priv->session)); /* FIXME EMailBackend should own the default EMFolderTreeModel. */ - folder_tree_model = em_folder_tree_model_get_default (E_MAIL_BACKEND (shell_backend)); - em_folder_tree_model_set_session (folder_tree_model, priv->session); + folder_tree_model = em_folder_tree_model_get_default (); + + /* FIXME This is creating a circular reference. Perhaps the + * should only hold a weak pointer to EMailBackend? */ + em_folder_tree_model_set_backend ( + folder_tree_model, E_MAIL_BACKEND (object)); g_signal_connect ( shell, "prepare-for-offline", |