diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-12-25 06:44:51 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-12-25 06:44:51 +0800 |
| commit | e3735c74444e3fdc35d1677c3cdf68dfc174ce10 (patch) | |
| tree | e596d9a07f05380efe8c336f5f1e97758162c324 /modules/mail/e-mail-shell-view-private.c | |
| parent | 563a326b133b8e86db1ec4d2d8191cf0ab1c3516 (diff) | |
| download | gsoc2013-evolution-e3735c74444e3fdc35d1677c3cdf68dfc174ce10.tar gsoc2013-evolution-e3735c74444e3fdc35d1677c3cdf68dfc174ce10.tar.gz gsoc2013-evolution-e3735c74444e3fdc35d1677c3cdf68dfc174ce10.tar.bz2 gsoc2013-evolution-e3735c74444e3fdc35d1677c3cdf68dfc174ce10.tar.lz gsoc2013-evolution-e3735c74444e3fdc35d1677c3cdf68dfc174ce10.tar.xz gsoc2013-evolution-e3735c74444e3fdc35d1677c3cdf68dfc174ce10.tar.zst gsoc2013-evolution-e3735c74444e3fdc35d1677c3cdf68dfc174ce10.zip | |
Move EMailLabelListStore to EMailSession.
Access the EMailLabelListStore through EMailSession instead of
EShellSettings, which was a quick hack of mine during kill-bonobo.
Diffstat (limited to 'modules/mail/e-mail-shell-view-private.c')
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index aaa4e5e4f3..269a122efe 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -612,7 +612,6 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) EShellView *shell_view; EShellBackend *shell_backend; EShellContent *shell_content; - EShellSettings *shell_settings; EShellSidebar *shell_sidebar; EShellTaskbar *shell_taskbar; EShellWindow *shell_window; @@ -623,9 +622,11 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) ERuleContext *context; EFilterRule *rule = NULL; GtkTreeSelection *selection; - GtkTreeModel *tree_model; GtkUIManager *ui_manager; GtkWidget *message_list; + EMailLabelListStore *label_store; + EMailBackend *backend; + EMailSession *session; EMailReader *reader; EMailView *mail_view; EWebView *web_view; @@ -643,10 +644,10 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) ui_manager = e_shell_window_get_ui_manager (shell_window); shell = e_shell_window_get_shell (shell_window); - shell_settings = e_shell_get_shell_settings (shell); - tree_model = e_shell_settings_get_object ( - shell_settings, "mail-label-list-store"); + backend = E_MAIL_BACKEND (shell_backend); + session = e_mail_backend_get_session (backend); + label_store = e_mail_session_get_label_store (session); e_shell_window_add_action_group (shell_window, "mail"); e_shell_window_add_action_group (shell_window, "mail-filter"); @@ -743,17 +744,17 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) mail_shell_view, G_CONNECT_SWAPPED); g_signal_connect_object ( - tree_model, "row-changed", + label_store, "row-changed", G_CALLBACK (e_mail_shell_view_update_search_filter), mail_shell_view, G_CONNECT_SWAPPED); g_signal_connect_object ( - tree_model, "row-deleted", + label_store, "row-deleted", G_CALLBACK (e_mail_shell_view_update_search_filter), mail_shell_view, G_CONNECT_SWAPPED); g_signal_connect_object ( - tree_model, "row-inserted", + label_store, "row-inserted", G_CALLBACK (e_mail_shell_view_update_search_filter), mail_shell_view, G_CONNECT_SWAPPED); |