Attachment 893292 Details for Bug 1090629 – evo patch

[patch] evo patch

evo-browser-filtered-1090629.patch (text/plain), 4.87 KB, created by Milan Crha on 2014-05-07 14:10:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2014-05-07 14:10:49 UTC

Size: 4.87 KB

patch

obsolete

>Index: mail/e-mail-browser.c
>===================================================================
>--- mail/e-mail-browser.c	(revision 1)
>+++ mail/e-mail-browser.c	(working copy)
>@@ -1014,8 +1014,6 @@ e_mail_browser_init (EMailBrowser *browser)
> 
> GtkWidget *
> e_mail_browser_new (EMailBackend *backend,
>-                    CamelFolder *folder,
>-                    const gchar *msg_uid,
>                     EMailFormatterMode display_mode)
> {
> 	g_return_val_if_fail (E_IS_MAIL_BACKEND (backend), NULL);
>Index: mail/e-mail-browser.h
>===================================================================
>--- mail/e-mail-browser.h	(revision 1)
>+++ mail/e-mail-browser.h	(working copy)
>@@ -62,8 +62,6 @@ struct _EMailBrowserClass {
> 
> GType		e_mail_browser_get_type		(void);
> GtkWidget *	e_mail_browser_new		(EMailBackend *backend,
>-						 CamelFolder *folder,
>-						 const gchar *message_uid,
> 						 EMailFormatterMode display_mode);
> void		e_mail_browser_close		(EMailBrowser *browser);
> EMailFormatterMode
>Index: mail/e-mail-reader-utils.c
>===================================================================
>--- mail/e-mail-reader-utils.c	(revision 1)
>+++ mail/e-mail-reader-utils.c	(working copy)
>@@ -875,17 +875,15 @@ e_mail_reader_open_selected (EMailReader *reader)
> 		GtkWidget *browser;
> 		MessageList *ml;
> 
>-		browser = e_mail_browser_new (
>-			backend, folder, uid,
>-			E_MAIL_FORMATTER_MODE_NORMAL);
>+		browser = e_mail_browser_new (backend, E_MAIL_FORMATTER_MODE_NORMAL);
> 
>-		e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
>-		e_mail_reader_set_message (E_MAIL_READER (browser), uid);
>-
> 		ml = MESSAGE_LIST (e_mail_reader_get_message_list (
> 			E_MAIL_READER (browser)));
> 		message_list_freeze (ml);
> 
>+		e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
>+		e_mail_reader_set_message (E_MAIL_READER (browser), uid);
>+
> 		copy_tree_state (reader, E_MAIL_READER (browser));
> 		e_mail_reader_set_group_by_threads (
> 			E_MAIL_READER (browser),
>Index: mail/e-mail-reader.c
>===================================================================
>--- mail/e-mail-reader.c	(revision 3)
>+++ mail/e-mail-reader.c	(working copy)
>@@ -1772,6 +1772,7 @@ action_mail_show_source_cb (GtkAction *action,
> 	EActivity *activity;
> 	GCancellable *cancellable;
> 	EMailReaderClosure *closure;
>+	MessageList *ml;
> 
> 	backend = e_mail_reader_get_backend (reader);
> 	folder = e_mail_reader_get_folder (reader);
>@@ -1779,10 +1780,14 @@ action_mail_show_source_cb (GtkAction *action,
> 	g_return_if_fail (uids != NULL && uids->len == 1);
> 	message_uid = g_ptr_array_index (uids, 0);
> 
>-	browser = e_mail_browser_new (
>-		backend, NULL, NULL, E_MAIL_FORMATTER_MODE_SOURCE);
>+	browser = e_mail_browser_new (backend, E_MAIL_FORMATTER_MODE_SOURCE);
>+	ml = MESSAGE_LIST (e_mail_reader_get_message_list (E_MAIL_READER (browser)));
>+
>+	message_list_freeze (ml);
> 	e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
> 	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
>+	message_list_thaw (ml);
>+
> 	display = e_mail_reader_get_mail_display (E_MAIL_READER (browser));
> 
> 	string = g_strdup_printf (_("Retrieving message '%s'"), message_uid);
>Index: mail/message-list.c
>===================================================================
>--- mail/message-list.c	(revision 4)
>+++ mail/message-list.c	(working copy)
>@@ -750,6 +750,12 @@ message_list_select_uid (MessageList *message_list
> 				message_list,
> 				message_list_signals[MESSAGE_SELECTED],
> 				0, message_list->cursor_uid);
>+	} else if (message_list->just_set_folder) {
>+		g_free (message_list->cursor_uid);
>+		message_list->cursor_uid = g_strdup (uid);
>+		g_signal_emit (
>+			message_list,
>+			message_list_signals[MESSAGE_SELECTED], 0, message_list->cursor_uid);
> 	} else {
> 		g_free (message_list->cursor_uid);
> 		message_list->cursor_uid = NULL;
>@@ -4903,6 +4909,13 @@ regen_list_done (struct _regen_list_msg *m)
> 		with_fallback = m->ml->pending_select_fallback;
> 		message_list_select_uid (m->ml, uid, with_fallback);
> 		g_free (uid);
>+	} else if (m->ml->regen == NULL && m->ml->ensure_uid) {
>+		gchar *uid;
>+
>+		uid = m->ml->ensure_uid;
>+		m->ml->ensure_uid = NULL;
>+		message_list_select_uid (m->ml, uid, FALSE);
>+		g_free (uid);
> 	} else if (m->ml->regen == NULL && m->ml->cursor_uid == NULL && m->last_row != -1) {
> 		ETreeTableAdapter *etta = e_tree_get_table_adapter (tree);
> 
>@@ -4918,6 +4931,8 @@ regen_list_done (struct _regen_list_msg *m)
> 		}
> 	}
> 
>+	message_list_ensure_message (m->ml, NULL);
>+
> 	if (gtk_widget_get_visible (GTK_WIDGET (m->ml))) {
> 		if (e_tree_row_count (E_TREE (m->ml)) <= 0) {
> 			/* space is used to indicate no search too */
>@@ -5079,6 +5094,9 @@ mail_regen_list (MessageList *ml,
> 	m->last_row = -1;
> 	m->expand_state = NULL;
> 
>+	if (ml->just_set_folder && ml->cursor_uid)
>+		message_list_ensure_message (ml, ml->cursor_uid);
>+
> 	if ((!m->hidedel || !m->dotree) && ml->thread_tree) {
> 		camel_folder_thread_messages_unref (ml->thread_tree);
> 		ml->thread_tree = NULL;

Actions: View | Diff

Attachments on bug 1090629: 889072 | 889098 | 893292