* maemo/modest-(edit-msg|main)-window.c:

  - compile fixes for changes in modest fw

pmo-trunk-r789

diff --git a/src/maemo/modest-edit-msg-window.c b/src/maemo/modest-edit-msg-window.c
index 26515cc..35d24d0 100644 (file)
--- a/src/maemo/modest-edit-msg-window.c
+++ b/src/maemo/modest-edit-msg-window.c
@@ -37,12 +37,11 @@
 
 #include "modest-edit-msg-window-ui.h"
 #include "modest-icon-names.h"
-#include "modest-icon-factory.h"
 #include "modest-widget-memory.h"
 #include "modest-window-priv.h"
 #include "modest-mail-operation.h"
 #include "modest-tny-platform-factory.h"
-#include "modest-tny-msg-actions.h"
+#include "modest-tny-msg.h"
 #include <tny-simple-list.h>
 
 static void  modest_edit_msg_window_class_init   (ModestEditMsgWindowClass *klass);
@@ -292,8 +291,7 @@ modest_edit_msg_window_new (ModestEditType type)
        restore_settings (MODEST_EDIT_MSG_WINDOW(obj));
        
        gtk_window_set_title (GTK_WINDOW(obj), "Modest");
-       gtk_window_set_icon  (GTK_WINDOW(obj),
-                             modest_icon_factory_get_icon (MODEST_APP_ICON));
+       gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
 
        g_signal_connect (G_OBJECT(obj), "delete-event",
                          G_CALLBACK(on_delete_event), obj);
@@ -331,7 +329,7 @@ modest_edit_msg_window_set_msg (ModestEditMsgWindow *self, TnyMsg *msg)
        
        buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
        gtk_text_buffer_set_text (buf,
-                                 (const gchar *) modest_tny_msg_actions_find_body (msg, FALSE),
+                                 (const gchar *) modest_tny_msg_get_body (msg, FALSE),
                                  -1);
 
        /* TODO: lower priority, select in the From: combo to the

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 27825ad..ccd48ea 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -37,7 +37,6 @@
 #include <modest-widget-factory.h>
 #include "modest-widget-memory.h"
 #include "modest-window-priv.h"
-#include "modest-icon-factory.h"
 #include "modest-ui.h"
 #include "modest-main-window-ui.h"
 #include "modest-account-view-window.h"
@@ -45,7 +44,7 @@
 #include "modest-conf.h"
 
 #include "modest-tny-platform-factory.h"
-#include "modest-tny-msg-actions.h"
+#include "modest-tny-msg.h"
 #include "modest-mail-operation.h"
 #include "modest-icon-names.h"
 
@@ -371,8 +370,7 @@ modest_main_window_new (void)
        restore_sizes (MODEST_MAIN_WINDOW(obj));        
 
        gtk_window_set_title (GTK_WINDOW(obj), _("Modest"));
-       gtk_window_set_icon  (GTK_WINDOW(obj),
-                             modest_icon_factory_get_icon (MODEST_APP_ICON));
+       gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
        
        gtk_widget_show_all (main_vbox);