From ae28ea4621c9ced08524548ca67a5297c284ce01 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 May 2011 21:01:48 -0400 Subject: 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(). --- modules/mail/e-mail-shell-content.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'modules/mail/e-mail-shell-content.c') diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index c3b6cf978b..57d1663434 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -361,8 +361,7 @@ mail_shell_content_get_window (EMailReader *reader) static void mail_shell_content_set_folder (EMailReader *reader, - CamelFolder *folder, - const gchar *folder_uri) + CamelFolder *folder) { EMailShellContentPrivate *priv; @@ -372,7 +371,7 @@ mail_shell_content_set_folder (EMailReader *reader, * also implements the EMailReader interface. */ reader = E_MAIL_READER (priv->mail_view); - return e_mail_reader_set_folder (reader, folder, folder_uri); + return e_mail_reader_set_folder (reader, folder); } static void -- cgit v1.2.3