X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-search.c;h=32f387f49e8e348da8cc7cb8306452e56541932f;hb=7cf7d40552d4509091984e1d647a4983a3205fe4;hp=f1500a774cb6bb1290676e53c9ea15a637fdff81;hpb=44420ca86dc9bc3d09c7d6c7bf06ecd37153ff50;p=modest

diff --git a/src/modest-search.c b/src/modest-search.c
index f1500a7..32f387f 100644
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -52,6 +52,7 @@
 #include "modest-account-mgr.h"
 #include "modest-tny-account-store.h"
 #include "modest-tny-account.h"
+#include "modest-tny-folder.h"
 #include "modest-search.h"
 #include "modest-runtime.h"
 #include "modest-platform.h"
@@ -388,8 +389,15 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
 	/* Check that we should be searching this folder. */
 	/* Note that we don't try to search sub-folders. 
 	 * Maybe we should, but that should be specified. */
-	if (search->folder && strlen (search->folder) && (strcmp (tny_folder_get_id (folder), search->folder) != 0))
-		return NULL;
+	if (search->folder && strlen (search->folder)) {
+		if (!strcmp (search->folder, "outbox")) {
+			if (modest_tny_folder_guess_folder_type (folder) != TNY_FOLDER_TYPE_OUTBOX) {
+				return NULL;
+			}
+		} else if (strcmp (tny_folder_get_id (folder), search->folder) != 0) {
+			return NULL;
+		}
+	}
 	
 	GList *retval = NULL;
 	TnyIterator *iter = NULL;