Merge bits and pieces of the anjal-evo-2-30 branch.

7 files changed, 32 insertions, 25 deletions

diff --git a/plugins/groupwise-features/gw-ui.c b/plugins/groupwise-features/gw-ui.c
index f026311841..6a79cd3b0f 100644
--- a/plugins/groupwise-features/gw-ui.c
+++ b/plugins/groupwise-features/gw-ui.c
@@ -26,6 +26,7 @@
 #include <mail/e-mail-reader.h>
 #include <mail/em-folder-tree.h>
 #include <mail/em-folder-tree-model.h>
+#include <mail/message-list.h>
 
 #include <calendar/gui/e-calendar-view.h>
 #include <calendar/gui/gnome-cal.h>
@@ -202,19 +203,19 @@ update_mmp_entries_cb (EShellView *shell_view, gpointer user_data)
 	if (visible) {
 		EShellContent *shell_content;
 		EMailReader *reader;
-		MessageList *message_list;
+		GtkWidget *message_list;
 		GPtrArray *selected;
 
 		shell_content = e_shell_view_get_shell_content (shell_view);
 
 		reader = (EMailReader *) (shell_content);
 		message_list = e_mail_reader_get_message_list (reader);
-		selected = message_list_get_selected (message_list);
+		selected = message_list_get_selected (MESSAGE_LIST (message_list));
 
 		if (selected)
 			n_selected = selected->len;
 
-		message_list_free_uids (message_list, selected);
+		message_list_free_uids (MESSAGE_LIST (message_list), selected);
 
 		visible = n_selected > 0;
 	}
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index fe82ccb4d5..4fc4b735c0 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -30,6 +30,7 @@
 #include <gtk/gtk.h>
 
 #include <mail/e-mail-reader.h>
+#include <mail/message-list.h>
 
 #include <e-gw-connection.h>
 
@@ -67,16 +68,16 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view)
 	gchar *msg;
 	EShellContent *shell_content;
 	EMailReader *reader;
-	MessageList *message_list;
+	GtkWidget *message_list;
 
 	shell_content = e_shell_view_get_shell_content (shell_view);
 
 	reader = (EMailReader *) (shell_content);
 	message_list = e_mail_reader_get_message_list (reader);
 	g_return_if_fail (message_list != NULL);
-	g_return_if_fail (message_list->folder != NULL);
+	g_return_if_fail (MESSAGE_LIST (message_list)->folder != NULL);
 
-	cnc = get_cnc (message_list->folder->parent_store);
+	cnc = get_cnc (MESSAGE_LIST (message_list)->folder->parent_store);
 
 	dialog =  gtk_dialog_new_with_buttons (_("Junk Settings"),
 			NULL,
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 70b79d7c80..01bf11c6fe 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -32,6 +32,7 @@
 #include <e-util/e-alert.h>
 
 #include <mail/e-mail-reader.h>
+#include <mail/message-list.h>
 
 #include "gw-ui.h"
 #include "share-folder.h"
@@ -41,7 +42,7 @@ get_selected_info (EShellView *shell_view, CamelFolder **folder, gchar **selecte
 {
 	EShellContent *shell_content;
 	EMailReader *reader;
-	MessageList *message_list;
+	GtkWidget *message_list;
 	GPtrArray *selected;
 
 	shell_content = e_shell_view_get_shell_content (shell_view);
@@ -50,13 +51,13 @@ get_selected_info (EShellView *shell_view, CamelFolder **folder, gchar **selecte
 	message_list = e_mail_reader_get_message_list (reader);
 	g_return_val_if_fail (message_list != NULL, FALSE);
 
-	selected = message_list_get_selected (message_list);
+	selected = message_list_get_selected (MESSAGE_LIST (message_list));
 	if (selected && selected->len == 1) {
-		*folder = message_list->folder;
+		*folder = MESSAGE_LIST (message_list)->folder;
 		*selected_uid = g_strdup (g_ptr_array_index (selected, 0));
 	}
 
-	message_list_free_uids (message_list, selected);
+	message_list_free_uids (MESSAGE_LIST (message_list), selected);
 
 	return *selected_uid != NULL;
 }
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index e38497823b..45d0a206c6 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -38,6 +38,7 @@
 #include <camel/camel-mime-message.h>
 
 #include <mail/e-mail-reader.h>
+#include <mail/message-list.h>
 
 #include <e-gw-connection.h>
 
@@ -63,7 +64,7 @@ get_selected_message (EShellView *shell_view, CamelFolder **folder, gchar **sele
 	CamelMimeMessage *msg = NULL;
 	EShellContent *shell_content;
 	EMailReader *reader;
-	MessageList *message_list;
+	GtkWidget *message_list;
 	GPtrArray *selected;
 
 	shell_content = e_shell_view_get_shell_content (shell_view);
@@ -72,15 +73,15 @@ get_selected_message (EShellView *shell_view, CamelFolder **folder, gchar **sele
 	message_list = e_mail_reader_get_message_list (reader);
 	g_return_val_if_fail (message_list != NULL, NULL);
 
-	selected = message_list_get_selected (message_list);
+	selected = message_list_get_selected (MESSAGE_LIST (message_list));
 	if (selected && selected->len == 1) {
-		*folder = message_list->folder;
+		*folder = MESSAGE_LIST (message_list)->folder;
 		*selected_uid = g_strdup (g_ptr_array_index (selected, 0));
 
 		msg = camel_folder_get_message (*folder, *selected_uid, NULL);
 	}
 
-	message_list_free_uids (message_list, selected);
+	message_list_free_uids (MESSAGE_LIST (message_list), selected);
 
 	return msg;
 }
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index a90731e2fc..6b79b78e94 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -50,6 +50,7 @@
 #include <mail/em-utils.h>
 #include <mail/em-format-html.h>
 #include <mail/mail-config.h>
+#include <mail/message-list.h>
 #include <e-util/e-account-utils.h>
 #include <e-util/e-dialog-utils.h>
 #include <calendar/common/authentication.h>
@@ -925,7 +926,7 @@ mail_to_event (ECalSourceType source_type,
                gboolean with_attendees,
                EMailReader *reader)
 {
-	MessageList *message_list;
+	GtkWidget *message_list;
 	CamelFolder *folder;
 	GPtrArray *selected;
 	ESourceList *source_list = NULL;
@@ -935,8 +936,8 @@ mail_to_event (ECalSourceType source_type,
 	GError *error = NULL;
 
 	message_list = e_mail_reader_get_message_list (reader);
-	selected = message_list_get_selected (message_list);
-	folder = message_list->folder;
+	selected = message_list_get_selected (MESSAGE_LIST (message_list));
+	folder = MESSAGE_LIST (message_list)->folder;
 
 	if (!e_cal_get_sources (&source_list, source_type, &error)) {
 		e_notice (NULL, GTK_MESSAGE_ERROR, _("Cannot get source list. %s"), error ? error->message : _("Unknown error."));
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index c665f33227..006215bf3f 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -44,6 +44,7 @@
 #include "mail/mail-ops.h"
 #include "mail/mail-mt.h"
 #include "mail/mail-config.h"
+#include "mail/message-list.h"
 #include "e-util/e-util.h"
 #include "e-util/e-alert.h"
 #include "shell/e-shell-view.h"
@@ -201,7 +202,7 @@ static void
 emla_list_action (EMailReader *reader,
                   EmlaAction action)
 {
-	MessageList *message_list;
+	GtkWidget *message_list;
 	CamelFolder *folder;
 	GPtrArray *uids;
 	emla_action_data *data;
@@ -209,9 +210,9 @@ emla_list_action (EMailReader *reader,
 
 	message_list = e_mail_reader_get_message_list (reader);
 
-	folder = message_list->folder;
-	folder_uri = message_list->folder_uri;
-	uids = message_list_get_selected (message_list);
+	folder = MESSAGE_LIST (message_list)->folder;
+	folder_uri = MESSAGE_LIST (message_list)->folder_uri;
+	uids = message_list_get_selected (MESSAGE_LIST (message_list));
 	g_return_if_fail (uids->len == 1);
 
 	data = g_malloc (sizeof (emla_action_data));
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index b96c01b868..5c9f795c20 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -698,7 +698,7 @@ update_actions_cb (EShellView *shell_view)
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
 	GtkUIManager *ui_manager;
-	MessageList *message_list;
+	GtkWidget *message_list;
 	CamelFolderInfo *folder_info;
 	CamelFolder *folder;
 	CamelStore *store;
@@ -726,8 +726,8 @@ update_actions_cb (EShellView *shell_view)
 	reader = E_MAIL_READER (shell_content);
 	message_list = e_mail_reader_get_message_list (reader);
 
-	folder = message_list->folder;
-	uids = message_list_get_selected (message_list);
+	folder = MESSAGE_LIST (message_list)->folder;
+	uids = message_list_get_selected (MESSAGE_LIST (message_list));
 
 	if (uids->len != 1)
 		goto exit;
@@ -745,7 +745,8 @@ update_actions_cb (EShellView *shell_view)
 	build_template_menus_recurse (
 		ui_manager, action_group,
 		"/mail-message-popup/mail-message-templates",
-		&action_count, merge_id, folder_info, message_list->folder, uids->pdata[0]);
+		&action_count, merge_id, folder_info,
+		MESSAGE_LIST (message_list)->folder, uids->pdata[0]);
 
 exit:
 	em_utils_uids_free (uids);