X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-search.c;h=9f6c1a1352a38292c036a4b924152c5545a0bd61;hp=af5a8af4a1f4f4fa1b3817c8fb44ec2d95022f1f;hb=cdd7a6d4dad11f659c34d0d3841b79a01f21d0e8;hpb=bc3bf842ec592f28b57c2cd6bd0a337202ece9bd

diff --git a/src/modest-search.c b/src/modest-search.c
index af5a8af..9f6c1a1 100644
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -109,7 +109,7 @@ add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
 	 * so we can find what we get. Philip is working on this.
 	 */
 	uid = tny_header_dup_uid (header);
-	if (!furl) {
+	if (!uid) {
 		gchar *subject = tny_header_dup_subject (header);
 		g_warning ("%s: tny_header_get_uid(): returned NULL for message with subject=%s\n", __FUNCTION__, subject);
 		g_free (subject);
@@ -346,7 +346,7 @@ search_mime_part_and_child_parts (TnyMimePart *part, ModestSearch *search)
 	gboolean found = FALSE;
 
 	/* Do not search into attachments */
-	if (modest_tny_mime_part_is_attachment_for_modest (part))
+	if (modest_tny_mime_part_is_attachment_for_modest (part) && !TNY_IS_MSG (part))
 		return FALSE;
 
 	#ifdef MODEST_HAVE_OGS
@@ -612,7 +612,7 @@ modest_search_account_get_folders_cb (TnyFolderStore *self,
 			TnyList *children = tny_simple_list_new ();
 			helper->pending_calls++;
 			tny_folder_store_get_folders_async (TNY_FOLDER_STORE (folder), children, NULL, 
-							    modest_search_account_get_folders_cb, 
+							    FALSE, modest_search_account_get_folders_cb, 
 							    NULL, helper);
 		}
 
@@ -654,7 +654,7 @@ _search_account (TnyAccount *account,
 
 	/* Get folders */
 	tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account), folders, NULL, 
-					    modest_search_account_get_folders_cb, 
+					    FALSE, modest_search_account_get_folders_cb, 
 					    NULL, helper);
 }