X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-search.h;h=81ef569959dd481a7497426bbcd7d69e2a72aacb;hp=d4a1894e1aa210841e11c225ef67f269191873a1;hb=0c949480fea81657bb216fc5447c4f44e7b373b2;hpb=09a856ec19c064af7daceb987b9a60dc7dace5f0

diff --git a/src/modest-search.h b/src/modest-search.h
index d4a1894..81ef569 100644
--- a/src/modest-search.h
+++ b/src/modest-search.h
@@ -1,9 +1,42 @@
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef MODEST_SEARCH_H
 #define MODEST_SEARCH_H
 
 #include <glib.h>
 #include <tny-folder.h>
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -26,18 +59,27 @@ typedef enum {
 } ModestSearchFlags;
 
 typedef struct {
-	gchar *subject, *from, *recipient, *body;
-	time_t before, after;
-	guint minsize;
+	const gchar *folder; /* The folder to search in */
+	
+	/* Text to search for in various parts: */
+	const gchar *subject;
+	const gchar *from;
+	const gchar *recipient;
+	const gchar *body;
+	
+	/* Other criteria: */
+	time_t start_date, end_date;
+	guint32 minsize;
 	ModestSearchFlags flags;
 #ifdef MODEST_HAVE_OGS
-	const gchar     *query;
+	const gchar     *query; /* The text to search for. */
 	OgsTextSearcher *text_searcher;	
 #endif
 } ModestSearch;
 
-GList * modest_search (TnyFolder *folder, ModestSearch *search);
-
+GList * modest_search_folder (TnyFolder *folder, ModestSearch *search);
+GList * modest_search_all_accounts (ModestSearch *search);
+GList * modest_search_account (TnyAccount *account, ModestSearch *search);
 G_END_DECLS
 
 #endif