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 /mail/e-mail-browser.c | |
| 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 'mail/e-mail-browser.c')
| -rw-r--r-- | mail/e-mail-browser.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index e605e27267..e0d6aa9e16 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -193,8 +193,9 @@ mail_browser_message_selected_cb (EMailBrowser *browser, const gchar *uid) { EMFormatHTMLDisplay *html_display; - MessageList *message_list; + GtkWidget *message_list; CamelMessageInfo *info; + CamelFolder *folder; EMailReader *reader; if (uid == NULL) @@ -203,7 +204,9 @@ mail_browser_message_selected_cb (EMailBrowser *browser, reader = E_MAIL_READER (browser); html_display = e_mail_reader_get_html_display (reader); message_list = e_mail_reader_get_message_list (reader); - info = camel_folder_get_message_info (message_list->folder, uid); + + folder = MESSAGE_LIST (message_list)->folder; + info = camel_folder_get_message_info (folder, uid); if (info == NULL) return; @@ -214,7 +217,7 @@ mail_browser_message_selected_cb (EMailBrowser *browser, gtk_widget_grab_focus ( GTK_WIDGET (((EMFormatHTML *) html_display)->html)); - camel_folder_free_message_info (message_list->folder, info); + camel_folder_free_message_info (folder, info); } static gboolean @@ -558,14 +561,14 @@ mail_browser_get_html_display (EMailReader *reader) return priv->html_display; } -static MessageList * +static GtkWidget * mail_browser_get_message_list (EMailReader *reader) { EMailBrowserPrivate *priv; priv = E_MAIL_BROWSER_GET_PRIVATE (reader); - return MESSAGE_LIST (priv->message_list); + return priv->message_list; } static GtkMenu * @@ -603,7 +606,7 @@ mail_browser_set_message (EMailReader *reader, const gchar *uid) { EMailReaderIface *iface; - MessageList *message_list; + GtkWidget *message_list; CamelMessageInfo *info; CamelFolder *folder; @@ -618,7 +621,7 @@ mail_browser_set_message (EMailReader *reader, message_list = e_mail_reader_get_message_list (reader); - folder = message_list->folder; + folder = MESSAGE_LIST (message_list)->folder; info = camel_folder_get_message_info (folder, uid); if (info != NULL) { |