X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-search.h;h=c35c3641c5b7605169d866db3e2c35d97f8815d2;hp=091a9dd08ce3cbc2a1ff70ba00ccab3bf3af392a;hb=56bc8a2cdb4cfd5acbc3f1a9abc2d7f00c73e7e9;hpb=f0e59e582ece5beef0ddd0e5660bb47051476762

diff --git a/src/modest-search.h b/src/modest-search.h
index 091a9dd..c35c364 100644
--- a/src/modest-search.h
+++ b/src/modest-search.h
@@ -1,10 +1,41 @@
+/* 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>
@@ -28,19 +59,42 @@ typedef enum {
 } ModestSearchFlags;
 
 typedef struct {
-	gchar *subject, *from, *recipient, *body;
-	time_t before, after;
+	gchar     *msgid; /* E.g. the URI of the message. */
+	gchar     *subject;
+	gchar     *folder; /* The name, not the URI. */
+	gchar     *sender;
+	guint64    msize;
+	gboolean   has_attachment;
+	gboolean   is_unread;
+	gint64     timestamp;		 
+} ModestSearchResultHit;
+
+typedef struct {
+	gchar *folder; /* The folder to search in */
+	
+	/* Text to search for in various parts: */
+	gchar *subject;
+	gchar *from;
+	gchar *recipient;
+	gchar *body;
+	
+	/* Other criteria: */
+	time_t start_date, end_date;
 	guint32 minsize;
 	ModestSearchFlags flags;
 #ifdef MODEST_HAVE_OGS
-	const gchar     *query;
+	gchar     *query; /* The text to search for. */
 	OgsTextSearcher *text_searcher;	
 #endif
 } ModestSearch;
 
-GList * modest_search_folder (TnyFolder *folder, ModestSearch *search);
-GList * modest_search_all_accounts (ModestSearch *search);
-GList * modest_search_account (TnyAccount *account, ModestSearch *search);
+typedef void (*ModestSearchCallback) (GList *hits, gpointer user_data);
+
+void modest_search_folder (TnyFolder *folder, ModestSearch *search, ModestSearchCallback callback, gpointer user_data);
+void modest_search_all_accounts (ModestSearch *search, ModestSearchCallback callback, gpointer user_data);
+void modest_search_account (TnyAccount *account, ModestSearch *search, ModestSearchCallback callback, gpointer user_data);
+void modest_search_free (ModestSearch *search);
+
 G_END_DECLS
 
 #endif