--- Merged the nautilus-search2 branch ---

4 files changed, 170 insertions, 0 deletions

diff --git a/test/.cvsignore b/test/.cvsignore
index 32b1fd7b8..57492f72f 100644
--- a/test/.cvsignore
+++ b/test/.cvsignore
@@ -8,3 +8,5 @@ test-nautilus-mime-actions-set
 test-nautilus-preferences-change
 test-nautilus-preferences-display
 test-nautilus-wrap-table
+test-nautilus-directory-async
+test-nautilus-search-engine
diff --git a/test/Makefile.am b/test/Makefile.am
index b6c59464e..b6fd4cd70 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -14,10 +14,16 @@ LDADD =\
 
 noinst_PROGRAMS =\
 	test-nautilus-wrap-table \
+	test-nautilus-search-engine \
+	test-nautilus-directory-async \
 	$(NULL)
 
 test_nautilus_wrap_table_SOURCES = test-nautilus-wrap-table.c test.c
 
+test_nautilus_search_engine_SOURCES = test-nautilus-search-engine.c 
+
+test_nautilus_directory_async_SOURCES = test-nautilus-directory-async.c
+
 EXTRA_DIST = \
 	test.h \
 	$(NULL)
diff --git a/test/test-nautilus-directory-async.c b/test/test-nautilus-directory-async.c
new file mode 100644
index 000000000..ed6eb35ae
--- /dev/null
+++ b/test/test-nautilus-directory-async.c
@@ -0,0 +1,106 @@
+#include <gtk/gtk.h>
+#include <libgnomevfs/gnome-vfs.h>
+#include <libnautilus-private/nautilus-directory.h>
+#include <libnautilus-private/nautilus-search-directory.h>
+#include <libnautilus-private/nautilus-file.h>
+#include <unistd.h>
+
+void *client1, *client2;
+
+#if 0
+static gboolean
+quit_cb (gpointer data)
+{
+	gtk_main_quit ();
+
+	return FALSE;
+}
+#endif
+
+static void
+files_added (NautilusDirectory *directory,
+	     GList *added_files)
+{
+#if 0
+	GList *list;
+
+	for (list = added_files; list != NULL; list = list->next) {
+		NautilusFile *file = list->data;
+
+		g_print (" - %s\n", nautilus_file_get_uri (file));
+	}
+#endif
+
+	g_print ("files added: %d files\n",
+		 g_list_length (added_files));
+}
+
+static void
+files_changed (NautilusDirectory *directory,
+	       GList *changed_files)
+{
+#if 0
+	GList *list;
+
+	for (list = changed_files; list != NULL; list = list->next) {
+		NautilusFile *file = list->data;
+
+		g_print (" - %s\n", nautilus_file_get_uri (file));
+	}
+#endif
+	g_print ("files changed: %d\n",
+		 g_list_length (changed_files));
+}
+
+static gboolean
+force_reload (NautilusDirectory *directory)
+{
+	g_print ("forcing reload!\n");
+
+	nautilus_directory_force_reload (directory);
+
+	return FALSE;
+}
+
+static void
+done_loading (NautilusDirectory *directory)
+{
+	static int i = 0;
+
+	g_print ("done loading\n");
+
+	if (i == 0) {
+		gtk_timeout_add (5000, (GSourceFunc)force_reload, directory);
+		i++;
+	} else {
+	}
+}
+
+int
+main (int argc, char **argv)
+{
+	NautilusDirectory *directory;
+	client1 = g_new0 (int, 1);
+	client2 = g_new0 (int, 1);
+	NautilusQuery *query;
+
+	gnome_vfs_init ();
+	gtk_init (&argc, &argv);
+
+	query = nautilus_query_new ();
+	nautilus_query_set_text (query, "richard hult");
+	directory = nautilus_directory_get ("x-nautilus-search://0/");
+	nautilus_search_directory_set_query (NAUTILUS_SEARCH_DIRECTORY (directory), query);
+	g_object_unref (query);
+
+	g_signal_connect (directory, "files-added", G_CALLBACK (files_added), NULL);
+	g_signal_connect (directory, "files-changed", G_CALLBACK (files_changed), NULL);
+	g_signal_connect (directory, "done-loading", G_CALLBACK (done_loading), NULL);
+	nautilus_directory_file_monitor_add (directory, client1, TRUE, TRUE,
+					     NAUTILUS_FILE_ATTRIBUTE_METADATA, 
+					     NULL, NULL);
+
+
+	gtk_main ();
+	return 0;
+}
diff --git a/test/test-nautilus-search-engine.c b/test/test-nautilus-search-engine.c
new file mode 100644
index 000000000..f6224d004
--- /dev/null
+++ b/test/test-nautilus-search-engine.c
@@ -0,0 +1,56 @@
+#include <libnautilus-private/nautilus-search-engine.h>
+#include <gtk/gtk.h>
+
+static void
+hits_added_cb (NautilusSearchEngine *engine, GSList *hits)
+{      
+	g_print ("hits added\n");
+	while (hits) {
+		g_print (" - %s\n", (char *)hits->data);
+		hits = hits->next;
+	}
+}
+
+static void
+hits_subtracted_cb (NautilusSearchEngine *engine, GSList *hits)
+{
+	g_print ("hits subtracted\n");
+	while (hits) {
+		g_print (" - %s\n", (char *)hits->data);
+		hits = hits->next;
+	}
+}
+
+static void
+finished_cb (NautilusSearchEngine *engine)
+{
+	g_print ("finished!\n");
+//	gtk_main_quit ();
+}
+
+int 
+main (int argc, char* argv[])
+{
+	NautilusSearchEngine *engine;
+	NautilusQuery *query;
+
+	gtk_init (&argc, &argv);
+
+	engine = nautilus_search_engine_new ();
+	g_signal_connect (engine, "hits-added", 
+			  G_CALLBACK (hits_added_cb), NULL);
+	g_signal_connect (engine, "hits-subtracted", 
+			  G_CALLBACK (hits_subtracted_cb), NULL);
+	g_signal_connect (engine, "finished", 
+			  G_CALLBACK (finished_cb), NULL);
+
+	query = nautilus_query_new ();
+	nautilus_query_set_text (query, "richard hult");
+	nautilus_search_engine_set_query (engine, query);
+	g_object_unref (query);
+
+	nautilus_search_engine_start (engine);
+       
+	gtk_main ();
+	return 0;
+}