* set the folder name in instead of the folder-url for the search results

[modest] / src / modest-search.c

diff --git a/src/modest-search.c b/src/modest-search.c
index c8d82c0..f5b7186 100644 (file)
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -65,6 +65,7 @@ g_strdup_or_null (const gchar *str)
        return string;
 }
 
+
 static GList*
 add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
 {
@@ -79,22 +80,36 @@ add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
        hit = g_slice_new0 (ModestSearchHit);
 
        furl = tny_folder_get_url_string (folder);
+       if (!furl) {
+               g_warning ("%s: tny_folder_get_url_string(): returned NULL for folder. Folder name=%s\n", __FUNCTION__, tny_folder_get_name (folder));
+       }
+       
+       /* Make sure that we use the short UID instead of the long UID,
+        * and/or find out what UID form is used when finding, in camel_data_cache_get().
+        * so we can find what we get. Philip is working on this.
+        */
        uid = tny_header_get_uid (header);
+       if (!furl) {
+               g_warning ("%s: tny_header_get_uid(): returned NULL for message with subject=%s\n", __FUNCTION__, tny_header_get_subject (header));
+       }
+       
        msg_url = g_strdup_printf ("%s/%s", furl, uid);
+       
        subject = tny_header_get_subject (header);
        sender = tny_header_get_from (header);
-
+       
        flags = tny_header_get_flags (header);
 
        hit->msgid = msg_url;
        hit->subject = g_strdup_or_null (subject);
        hit->sender = g_strdup_or_null (sender);
-       hit->folder = furl;
+       hit->folder = g_strdup_or_null (tny_folder_get_name (folder));
+               //furl; /* We just provide our new instance instead of copying it and freeing it. */
        hit->msize = tny_header_get_message_size (header);
        hit->has_attachment = flags & TNY_HEADER_FLAG_ATTACHMENTS;
        hit->is_unread = ! (flags & TNY_HEADER_FLAG_SEEN);
        hit->timestamp = tny_header_get_date_received (header);
-
+       
        return g_list_prepend (list, hit);
 }
 
@@ -184,8 +199,8 @@ search_mime_part_strcmp (TnyMimePart *part, ModestSearch *search)
        TnyStream *stream;
        char       buffer[8193];
        char      *chunk[2];
-       gsize      len;
-       gssize     nread;
+       gssize     len;
+       gsize     nread;
        gboolean   found;
        gboolean   res;
 
@@ -347,11 +362,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) {
@@ -378,7 +394,7 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
                        msg = tny_folder_get_msg (folder, cur, &err);
 
                        if (err != NULL || msg == NULL) {
-                               g_warning ("Could not get message\n");
+                               g_warning ("%s: Could not get message.\n", __FUNCTION__);
                                g_error_free (err);
 
                                if (msg) {
@@ -489,8 +505,8 @@ modest_search_all_accounts (ModestSearch *search)
 
                account = TNY_ACCOUNT (tny_iterator_get_current (iter));
 
-               g_debug ("Searching account %s",
-                        tny_account_get_name (account));
+               g_debug ("DEBUG: %s: Searching account %s",
+                        __FUNCTION__, tny_account_get_name (account));
                res = modest_search_account (account, search);
                
                if (res != NULL) {