Hiroyuki Ikezoe
ikezo****@users*****
Wed Dec 6 15:08:04 JST 2006
Index: kazehakase/src/mozilla/kz-mozembed.cpp
diff -u kazehakase/src/mozilla/kz-mozembed.cpp:1.220 kazehakase/src/mozilla/kz-mozembed.cpp:1.221
--- kazehakase/src/mozilla/kz-mozembed.cpp:1.220 Wed Dec 6 11:25:23 2006
+++ kazehakase/src/mozilla/kz-mozembed.cpp Wed Dec 6 15:08:04 2006
@@ -46,9 +46,6 @@
#include "utils.h"
#include "kz-search.h"
-#ifdef USE_RAST
-# include "rast-search.h"
-#endif
#include <nsCOMPtr.h>
#include <nsIDOMDocument.h>
@@ -1025,16 +1022,10 @@
gchar *filename;
filename = mozilla_store_history_file(kzembed);
if (filename)
- {
-#ifdef USE_RAST
- if (exists_search_cmd)
- g_idle_add(rast_update_index, filename);
-#endif
g_free(filename);
- }
}
- if (exists_search_cmd)
+ if (kz_search)
{
const gchar *title = kz_moz_embed_get_title(KZ_EMBED(kzembed));
@@ -1047,15 +1038,9 @@
NS_UTF16ToCString (value, NS_CSTRING_ENCODING_UTF8, cValue);
}
gchar *contents = g_strdup(cValue.get());
-
- KzSearch *search = kz_search_new("hyperestraier");
- if (search)
- {
- kz_search_register_document(search, uri, title, contents, last_modified);
- g_object_unref(search);
- }
+ kz_search_register_document(kz_search, uri, title, contents, last_modified);
#ifdef WITH_ANTHY
- search = kz_search_new("anthy-trainer");
+ KzSearch *search = kz_search_new("anthy-trainer");
if (search)
{
kz_search_register_document(search, uri, title, contents, last_modified);
Index: kazehakase/src/mozilla/kz-mozhistorysearch.cpp
diff -u kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.21 kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.22
--- kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.21 Tue Dec 5 14:26:34 2006
+++ kazehakase/src/mozilla/kz-mozhistorysearch.cpp Wed Dec 6 15:08:04 2006
@@ -47,9 +47,7 @@
#include "MozillaPrivate.h"
#include "config.h"
#include "kz-search.h"
-#if USE_RAST
-# include "rast-search.h"
-#endif
+#include "kazehakase.h"
static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
@@ -243,15 +241,8 @@
/* render the complete portal */
gchar *html = NULL;
- KzSearch *search = kz_search_new("hyperestraier");
- if (search)
- {
- html = kz_search_get_search_result_html(search, unescaped);
- g_object_unref(search);
- }
-#ifdef USE_RAST
- html = rast_get_search_result(unescaped);
-#endif
+ if (kz_search)
+ html = kz_search_get_search_result_html(kz_search, unescaped);
nsMemory::Free(unescaped);
if (html)