Fixed build errors

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 62fce99..9e25464 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -53,9 +53,12 @@
 #include <widgets/modest-header-window.h>
 #include <widgets/modest-folder-window.h>
 #include <widgets/modest-accounts-window.h>
+
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <hildon/hildon-gtk.h>
 #include <modest-maemo-utils.h>
+#else
+#include <widgets/modest-shell-window.h>
 #endif
 #include "modest-utils.h"
 #include "widgets/modest-connection-specific-smtp-window.h"
@@ -4742,7 +4745,11 @@ create_move_to_dialog (GtkWindow *win,
                modest_folder_view_set_style (MODEST_FOLDER_VIEW (tree_view),
                                              MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+               modest_window = (ModestWindow *) win;
+#else
                modest_window = modest_shell_peek_window (MODEST_SHELL (win));
+#endif
                active_account_name = modest_window_get_active_account (modest_window);
                mgr = modest_runtime_get_account_mgr ();
                settings = modest_account_mgr_load_account_settings (mgr, active_account_name);

diff --git a/src/widgets/modest-header-window.c b/src/widgets/modest-header-window.c
index 16ae654..c8ffcc3 100644 (file)
--- a/src/widgets/modest-header-window.c
+++ b/src/widgets/modest-header-window.c
@@ -637,7 +637,7 @@ tap_and_hold_query_cb (GtkWidget *header_view,
                       gpointer user_data)
 {
        /* Ignore other clicks but right button single clicks */
-       if (!GDK_IS_EVENT_BUTTON (event) || (event->type != GDK_BUTTON_PRESS))
+       if (event->type != GDK_BUTTON_PRESS)
                return FALSE;
 
        return !show_context_menu ((ModestHeaderWindow *) user_data,

diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c
index abaafcd..91dfcc4 100644 (file)
--- a/src/widgets/modest-msg-view-window.c
+++ b/src/widgets/modest-msg-view-window.c
@@ -2775,7 +2775,7 @@ on_decode_to_stream_async_handler (TnyMimePart *mime_part,
                                account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
 
                        msg = tny_camel_msg_new ();
-                       tny_camel_msg_parse (msg, file_stream);
+                       tny_camel_msg_parse ((TnyCamelMsg *) msg, file_stream);
 
                        if (priv->top_msg)
                                top_msg = g_object_ref (priv->top_msg);