svnno****@sourc*****
svnno****@sourc*****
Tue Mar 27 15:08:20 JST 2007
Revision: 3050
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3050
Author: kous
Date: 2007-03-27 15:08:20 +0900 (Tue, 27 Mar 2007)
Log Message:
-----------
* src/prefs_ui/prefs_history.c: used kz_search_engine_ids()
instead of kz_search_engine_names().
* src/kz-search.[ch] (kz_search_engine_ids): added.
* module/search/Makefile.am (AM_CPPFLAGS): removed KZ_XXX macros.
* module/search/kz-hyper-estraier-search.c: used
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/search/Makefile.am
kazehakase/trunk/module/search/kz-hyper-estraier-search.c
kazehakase/trunk/src/kz-search.c
kazehakase/trunk/src/kz-search.h
kazehakase/trunk/src/prefs_ui/prefs_history.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-27 05:52:35 UTC (rev 3049)
+++ kazehakase/trunk/ChangeLog 2007-03-27 06:08:20 UTC (rev 3050)
@@ -1,3 +1,15 @@
+2007-03-27 Kouhei Sutou <kou****@cozmi*****>
+
+ * src/prefs_ui/prefs_history.c: used kz_search_engine_ids()
+ instead of kz_search_engine_names().
+
+ * src/kz-search.[ch] (kz_search_engine_ids): added.
+
+ * module/search/Makefile.am (AM_CPPFLAGS): removed KZ_XXX macros.
+
+ * module/search/kz-hyper-estraier-search.c: used
+ KZ_GET_HISTORY_DIR.
+
2007-03-27 Hiroyuki Ikezoe <poinc****@ikezo*****>
* module/embed/gtk-webcore/kz-gtk-webcore.cpp: Cookies is always
Modified: kazehakase/trunk/module/search/Makefile.am
===================================================================
--- kazehakase/trunk/module/search/Makefile.am 2007-03-27 05:52:35 UTC (rev 3049)
+++ kazehakase/trunk/module/search/Makefile.am 2007-03-27 06:08:20 UTC (rev 3050)
@@ -1,15 +1,9 @@
CLEANFILES = *~ *.bak
-AM_CPPFLAGS = \
- -DLOCALEDIR=\""$(localedir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DEXTDIR=\""$(extdir)"\" \
- -DKZ_SYSCONFDIR=\""$(sysconfdir)/$(PACKAGE)"\" \
- -DKZ_DATADIR=\""$(datadir)/$(PACKAGE)"\" \
- -DGTK_DISABLE_DEPRECATED=1 \
- -DGDK_DISABLE_DEPRECATED=1 \
- -DG_LOG_DOMAIN=\"Kazehakase-Search\" \
+AM_CPPFLAGS = \
+ -DGTK_DISABLE_DEPRECATED=1 \
+ -DGDK_DISABLE_DEPRECATED=1 \
+ -DG_LOG_DOMAIN=\"Kazehakase-Search\" \
-DG_DISABLE_DEPRECATED=1
INCLUDES = $(GLIB_CFLAGS) \
Modified: kazehakase/trunk/module/search/kz-hyper-estraier-search.c
===================================================================
--- kazehakase/trunk/module/search/kz-hyper-estraier-search.c 2007-03-27 05:52:35 UTC (rev 3049)
+++ kazehakase/trunk/module/search/kz-hyper-estraier-search.c 2007-03-27 06:08:20 UTC (rev 3050)
@@ -34,7 +34,7 @@
#include "kz-module-impl.h"
#include "egg-pixbuf-thumbnail.h"
-#define HISTORY_INDEX "history_index.hest"
+#define HISTORY_INDEX_SUFFIX "_index.hest"
#define KZ_TYPE_HYPER_ESTRAIER_SEARCH (kz_type_hyper_estraier_search)
#define KZ_HYPER_ESTRAIER_SEARCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), KZ_TYPE_HYPER_ESTRAIER_SEARCH, KzHyperEstraierSearch))
@@ -175,10 +175,9 @@
static void
kz_hyper_estraier_search_init (KzHyperEstraierSearch *search)
{
- search->cache_path = g_build_filename(g_get_home_dir(), HISTORY_DIR,
- NULL);
- search->dbname = g_build_filename(g_get_home_dir(),
- "."PACKAGE, HISTORY_INDEX, NULL);
+ search->cache_path = g_strdup(KZ_GET_HISTORY_DIR);
+ search->dbname = g_strconcat(search->cache_path, HISTORY_INDEX_SUFFIX,
+ NULL);
search->cache_path_len = strlen(search->cache_path);
}
Modified: kazehakase/trunk/src/kz-search.c
===================================================================
--- kazehakase/trunk/src/kz-search.c 2007-03-27 05:52:35 UTC (rev 3049)
+++ kazehakase/trunk/src/kz-search.c 2007-03-27 06:08:20 UTC (rev 3050)
@@ -82,6 +82,25 @@
return result;
}
+GList *
+kz_search_engine_ids (void)
+{
+ GList *node;
+ GList *result = NULL;
+
+ if (!searches)
+ kz_search_load(NULL);
+
+ for (node = searches; node; node = g_list_next(node))
+ {
+ KzModule *module = node->data;
+ result = g_list_append(result,
+ g_strdup(G_TYPE_MODULE(module)->name));
+ }
+
+ return result;
+}
+
static KzSearch *
_kz_search_new (KzModule *module, const gchar *name,
const gchar *first_property, ...)
Modified: kazehakase/trunk/src/kz-search.h
===================================================================
--- kazehakase/trunk/src/kz-search.h 2007-03-27 05:52:35 UTC (rev 3049)
+++ kazehakase/trunk/src/kz-search.h 2007-03-27 06:08:20 UTC (rev 3050)
@@ -58,6 +58,7 @@
void kz_search_unload (void);
void kz_search_exit (void);
GList *kz_search_engine_names (void);
+GList *kz_search_engine_ids (void);
KzSearch *kz_search_new (const gchar *name);
Modified: kazehakase/trunk/src/prefs_ui/prefs_history.c
===================================================================
--- kazehakase/trunk/src/prefs_ui/prefs_history.c 2007-03-27 05:52:35 UTC (rev 3049)
+++ kazehakase/trunk/src/prefs_ui/prefs_history.c 2007-03-27 06:08:20 UTC (rev 3050)
@@ -113,22 +113,22 @@
gchar *search_engine_name;
gint i = 0, active = 0;
GList *node;
- GList *search_engine_names = NULL;
+ GList *search_engine_ids = NULL;
search_engine_name = KZ_CONF_GET_STR("History", "search_engine");
gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _("None"));
- search_engine_names = kz_search_engine_names();
- for (node = search_engine_names; node; node = g_list_next(node))
+ search_engine_ids = kz_search_engine_ids();
+ for (node = search_engine_ids; node; node = g_list_next(node))
{
- gchar *engine_name = node->data;
- gtk_combo_box_append_text(combo, engine_name);
+ gchar *engine_id = node->data;
+ gtk_combo_box_append_text(combo, engine_id);
i++;
- if (strcmp(engine_name, search_engine_name) == 0)
+ if (strcmp(engine_id, search_engine_name) == 0)
active = i;
- g_free(engine_name);
+ g_free(engine_id);
}
- g_list_free(search_engine_names);
+ g_list_free(search_engine_ids);
if (search_engine_name)
g_free(search_engine_name);