[Kazehakase-cvs] CVS update: kazehakase/src/mozilla

Back to archive index

Ryo SHIMIZU furyo****@users*****
Thu Feb 23 22:30:57 JST 2006


Index: kazehakase/src/mozilla/kz-mozembed.cpp
diff -u kazehakase/src/mozilla/kz-mozembed.cpp:1.196 kazehakase/src/mozilla/kz-mozembed.cpp:1.197
--- kazehakase/src/mozilla/kz-mozembed.cpp:1.196	Mon Jan 23 12:05:48 2006
+++ kazehakase/src/mozilla/kz-mozembed.cpp	Thu Feb 23 22:30:57 2006
@@ -41,7 +41,12 @@
 #include "migemo.h"
 #endif
 #include "utils.h"
-#include "estsearch.h"
+
+#if USE_HYPERESTRAIER
+#	include "estsearch.h"
+#elif USE_RAST
+#	include "rast-search.h"
+#endif
 
 #include <nsCOMPtr.h>
 #include <nsIDOMDocument.h>
@@ -1001,14 +1006,18 @@
 			kz_moz_embed_create_thumbnail(KZ_EMBED(kzembed));
 		}
 		
-		if (store_cache && exists_estcmd &&
+		if (store_cache && exists_search_cmd &&
 		    (!last_modified || (history_get_last_modified(uri) < last_modified)) &&
 		    !g_str_has_prefix(location, "history-search:"))
 		{
 			gchar *filename;
 			filename = mozilla_store_history_file(kzembed);
 			if (filename)
+#if USE_HYPERESTRAIER
 				g_idle_add(estsearch_update_index, filename);
+#elif USE_RAST
+				g_idle_add(rast_update_index, filename);
+#endif
 		}
 	}
 	
Index: kazehakase/src/mozilla/kz-mozhistorysearch.cpp
diff -u kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.15 kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.16
--- kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.15	Mon Oct 24 21:27:05 2005
+++ kazehakase/src/mozilla/kz-mozhistorysearch.cpp	Thu Feb 23 22:30:57 2006
@@ -45,7 +45,12 @@
 #include "kz-mozhistorysearch.h"
 #include "kz-mozutils.h"
 #include "MozillaPrivate.h"
-#include "estsearch.h"
+#include "config.h"
+#if USE_HYPERESTRAIER
+#	include "estsearch.h"
+#elif USE_RAST
+#	include "rast-search.h"
+#endif
 
 static NS_DEFINE_CID(kSimpleURICID,     NS_SIMPLEURI_CID);
 
@@ -238,7 +243,12 @@
 	if (NS_FAILED(rv)) return rv;
 	
 	/* render the complete portal */
-	gchar *html = estsearch_get_search_result(unescaped);
+	gchar *html = NULL;
+#if USE_HYPERESTRAIER
+	html = estsearch_get_search_result(unescaped);
+#elif USE_RAST
+	html = rast_get_search_result(unescaped);
+#endif
 
 	nsMemory::Free(unescaped);
 	if (html)


More information about the Kazehakase-cvs mailing list
Back to archive index