diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-03 09:01:48 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-03 09:01:48 +0800 |
| commit | ae28ea4621c9ced08524548ca67a5297c284ce01 (patch) | |
| tree | cfdedc1510c91df7f11712007fb257e9c5c26791 /mail/e-mail-paned-view.c | |
| parent | 52844f40f158be11749f5d8dcdf52454e776c9bd (diff) | |
| download | gsoc2013-evolution-ae28ea4621c9ced08524548ca67a5297c284ce01.tar.gz gsoc2013-evolution-ae28ea4621c9ced08524548ca67a5297c284ce01.tar.zst gsoc2013-evolution-ae28ea4621c9ced08524548ca67a5297c284ce01.zip | |
EMailShellView: Open the selected folder ourselves.
This one's a little involved:
- EMailShellView now obtains a CamelFolder itself in response to
EMFolderTree::folder-selected signals. Uses EActivity to do so.
- Revise EMFolderTree::folder-selected signal arguments to be more
useful: emit a CamelStore object instead of a folder URI.
- Also revise EMFolderTree::folder-activiated signal arguments the
same way while we're at it.
- Remove the "folder_uri" argument from e_mail_reader_set_folder().
If you have a CamelFolder object you can obtain the URI string by
calling camel_folder_get_uri().
Diffstat (limited to 'mail/e-mail-paned-view.c')
| -rw-r--r-- | mail/e-mail-paned-view.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index c1e4cc415a..62d3e67c8e 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -456,8 +456,7 @@ mail_paned_view_get_window (EMailReader *reader) static void mail_paned_view_set_folder (EMailReader *reader, - CamelFolder *folder, - const gchar *folder_uri) + CamelFolder *folder) { EMailPanedViewPrivate *priv; EMailView *view; @@ -469,6 +468,7 @@ mail_paned_view_set_folder (EMailReader *reader, GtkWidget *message_list; GKeyFile *key_file; gchar *group_name; + const gchar *folder_uri; const gchar *key; gboolean value; GError *error = NULL; @@ -488,7 +488,7 @@ mail_paned_view_set_folder (EMailReader *reader, /* Chain up to interface's default set_folder() method. */ default_interface = g_type_default_interface_peek (E_TYPE_MAIL_READER); - default_interface->set_folder (reader, folder, folder_uri); + default_interface->set_folder (reader, folder); if (folder == NULL) goto exit; @@ -507,6 +507,7 @@ mail_paned_view_set_folder (EMailReader *reader, /* Restore the folder's preview and threaded state. */ + folder_uri = camel_folder_get_uri (folder); key_file = e_shell_view_get_state_key_file (shell_view); group_name = g_strdup_printf ("Folder %s", folder_uri); |