Build fixes

diff --git a/src/hildon2/asdbus.c b/src/hildon2/asdbus.c
index 38aef5f..cb87c95 100644 (file)
--- a/src/hildon2/asdbus.c
+++ b/src/hildon2/asdbus.c
@@ -2,7 +2,6 @@
 #include "asdbus-bindings.h"
 
 #include <glib-object.h>
-#include <asconfig.h>
 
 
 static

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index 03568b9..5991e40 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -157,6 +157,7 @@ struct _ModestHeaderViewPrivate {
        ModestHeaderViewFilter filter;
 #ifdef MODEST_TOOLKIT_HILDON2
        GtkWidget *live_search;
+       guint live_search_timeout;
 #endif
 
        gint    sort_colid[2][TNY_FOLDER_TYPE_NUM];
@@ -2762,12 +2763,14 @@ modest_header_view_set_filter_string (ModestHeaderView *self,
 
 #ifdef MODEST_TOOLKIT_HILDON2
 static gboolean
-on_live_search_refilter (HildonLiveSearch *livesearch,
-                        ModestHeaderView *self)
+on_live_search_timeout (ModestHeaderView *self)
 {
        const gchar *needle;
+       ModestHeaderViewPrivate *priv;
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
 
-       needle = hildon_live_search_get_text (livesearch);
+       needle = hildon_live_search_get_text ((HildonLiveSearch *) priv->live_search);
        if (needle && needle[0] != '\0') {
                modest_header_view_set_filter_string (MODEST_HEADER_VIEW (self), needle);
        } else {

diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c
index f68d07a..9a16fe7 100644 (file)
--- a/src/widgets/modest-msg-view-window.c
+++ b/src/widgets/modest-msg-view-window.c
@@ -2777,7 +2777,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 (TNY_CAMEL_MSG (msg), file_stream);
+                       tny_camel_msg_parse (msg, file_stream);
 
                        if (priv->top_msg)
                                top_msg = g_object_ref (priv->top_msg);