Hiroyuki Ikezoe
ikezo****@users*****
Sun Dec 3 11:17:40 JST 2006
Index: kazehakase/src/Makefile.am
diff -u kazehakase/src/Makefile.am:1.119 kazehakase/src/Makefile.am:1.120
--- kazehakase/src/Makefile.am:1.119 Tue Nov 14 11:19:06 2006
+++ kazehakase/src/Makefile.am Sun Dec 3 11:17:40 2006
@@ -79,6 +79,7 @@
kz-autoscroller.h \
kz-popup-preview.h \
kz-popup-tablist.h \
+ kz-search.h \
kz-statusbar.h \
kz-ext.h
@@ -114,6 +115,7 @@
kz-autoscroller.c \
kz-popup-preview.c \
kz-popup-tablist.c \
+ kz-search.c \
kz-statusbar.c \
kz-ext.c \
$(enum_sources) \
Index: kazehakase/src/main.c
diff -u kazehakase/src/main.c:1.115 kazehakase/src/main.c:1.116
--- kazehakase/src/main.c:1.115 Tue Oct 17 23:28:48 2006
+++ kazehakase/src/main.c Sun Dec 3 11:17:40 2006
@@ -47,7 +47,7 @@
#include "utils.h"
#if USE_HYPERESTRAIER
-# include "estsearch.h"
+# include "kz-search.h"
#elif USE_RAST
# include "rast-search.h"
#endif
@@ -533,7 +533,12 @@
if (exists_search_cmd)
{
#if USE_HYPERESTRAIER
- estsearch_purge_index();
+ KzSearch *search = kz_search_get_instance ("est");
+ if (search)
+ {
+ kz_search_purge_index(search);
+ g_object_unref(search);
+ }
#elif USE_RAST
#endif
}
@@ -590,8 +595,9 @@
if (use_history_search)
{
#if USE_HYPERESTRAIER
+ KzSearch *search = kz_search_get_instance ("est");
search_command = g_find_program_in_path("estcmd");
- exists_index = estsearch_exist_index_dir();
+ exists_index = kz_search_exist_index_dir(search);
#elif USE_RAST
search_command = g_find_program_in_path("rast");
exists_index = rast_exist_index_dir();
@@ -601,12 +607,16 @@
exists_search_cmd = TRUE;
if (!exists_index)
#if USE_HYPERESTRAIER
- estsearch_make_index();
+ kz_search_make_index(search);
#elif USE_RAST
rast_make_index();
#endif
g_free(search_command);
}
+#if USE_HYPERESTRAIER
+ if (search)
+ g_object_unref(search);
+#endif
}
/* load bookmarks */