diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-12-01 03:46:26 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-12-01 07:34:38 +0800 |
commit | d94534c3673956164f9fb2c7f6b12188994503ae (patch) | |
tree | c26a8a2edb293478b2ad43e36de5feebaf84ce1d /plugins/groupwise-features | |
parent | 420a4ccb20825d618b06c6be742c2c47cc15ca71 (diff) | |
download | gsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.tar gsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.tar.gz gsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.tar.bz2 gsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.tar.lz gsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.tar.xz gsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.tar.zst gsoc2013-evolution-d94534c3673956164f9fb2c7f6b12188994503ae.zip |
Merge bits and pieces of the anjal-evo-2-30 branch.
Diffstat (limited to 'plugins/groupwise-features')
-rw-r--r-- | plugins/groupwise-features/gw-ui.c | 7 | ||||
-rw-r--r-- | plugins/groupwise-features/junk-mail-settings.c | 7 | ||||
-rw-r--r-- | plugins/groupwise-features/mail-retract.c | 9 | ||||
-rw-r--r-- | plugins/groupwise-features/status-track.c | 9 |
4 files changed, 18 insertions, 14 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; } |