A few small fixes for the modest-search feature

pmo-trunk-r2209

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 2f1a3ac..1a948a7 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -525,7 +525,7 @@ find_message_by_url (const char *uri, TnyAccount **ac_out)
        TnyAccount            *account;
        TnyFolder             *folder;
        TnyMsg                *msg;
-
+       GError *err = NULL;
        account = NULL;
        msg = NULL;
        folder = NULL;
@@ -556,22 +556,26 @@ find_message_by_url (const char *uri, TnyAccount **ac_out)
 
        folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account),
                                                uri,
-                                               NULL);
+                                               &err);
 
        if (folder == NULL) {
                g_debug ("%s: tny_store_account_find_folder() failed.\n", __FUNCTION__);
                goto out;
        }
-       g_debug ("%s: Found folder.\n",  __FUNCTION__);
+       g_debug ("%s: Found folder. (%s)\n",  __FUNCTION__, uri);
        
 
-       msg = tny_folder_find_msg (folder, uri, NULL);
+       msg = tny_folder_find_msg (folder, uri, &err);
        
        if (!msg) {
-               g_debug ("%s: tny_folder_find_msg() failed.\n", __FUNCTION__);
+               g_debug ("%s: tny_folder_find_msg() failed (%s).\n",
+                        __FUNCTION__, err->message);
        }
 
 out:
+       if (err)
+               g_error_free (err);
+
        if (account && !msg) {
                g_object_unref (account);
                *ac_out = NULL;

diff --git a/src/modest-search.c b/src/modest-search.c
index 60a15bf..10dd422 100644 (file)
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -360,11 +360,12 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
                }
                
                if (!found && search->flags & MODEST_SEARCH_SENDER) {
-                       const char *str = tny_header_get_from (cur);
+                       char *str = g_strdup (tny_header_get_from (cur));
 
-                       if ((found = search_string (search->from, str, search))) {
+                       if ((found = search_string (search->from, (const gchar *) str, search))) {
                                retval = add_hit (retval, cur, folder);
                        }
+                       g_free (str);
                }
                
                if (!found && search->flags & MODEST_SEARCH_RECIPIENT) {