From 1879122b181e26c3e9e9e019612fb66f96328455 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(). --- mail/e-mail-reader.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mail/e-mail-reader.h') diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h index d9a78f2cc9..8076b08061 100644 --- a/mail/e-mail-reader.h +++ b/mail/e-mail-reader.h @@ -98,8 +98,7 @@ struct _EMailReaderInterface { CamelFolder * (*get_folder) (EMailReader *reader); const gchar * (*get_folder_uri) (EMailReader *reader); void (*set_folder) (EMailReader *reader, - CamelFolder *folder, - const gchar *folder_uri); + CamelFolder *folder); void (*set_message) (EMailReader *reader, const gchar *uid); guint (*open_selected_mail) (EMailReader *reader); @@ -136,8 +135,7 @@ GtkWindow * e_mail_reader_get_window (EMailReader *reader); CamelFolder * e_mail_reader_get_folder (EMailReader *reader); const gchar * e_mail_reader_get_folder_uri (EMailReader *reader); void e_mail_reader_set_folder (EMailReader *reader, - CamelFolder *folder, - const gchar *folder_uri); + CamelFolder *folder); void e_mail_reader_set_folder_uri (EMailReader *reader, const gchar *folder_uri); void e_mail_reader_set_message (EMailReader *reader, -- cgit v1.2.3