svnno****@sourc*****
svnno****@sourc*****
Tue Mar 27 15:18:31 JST 2007
Revision: 3051 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3051 Author: kous Date: 2007-03-27 15:18:30 +0900 (Tue, 27 Mar 2007) Log Message: ----------- * module/embed/gecko/kz-gecko-embed.cpp: used KZ_GET_HISTORY_DIR instead of KZ_HISTORY_DIR. * module/embed/gecko/Makefile.am: removed KZ_XXX macros. Modified Paths: -------------- kazehakase/trunk/ChangeLog kazehakase/trunk/module/embed/gecko/Makefile.am kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp Modified: kazehakase/trunk/ChangeLog =================================================================== --- kazehakase/trunk/ChangeLog 2007-03-27 06:08:20 UTC (rev 3050) +++ kazehakase/trunk/ChangeLog 2007-03-27 06:18:30 UTC (rev 3051) @@ -1,5 +1,10 @@ 2007-03-27 Kouhei Sutou <kou****@cozmi*****> + * module/embed/gecko/kz-gecko-embed.cpp: used KZ_GET_HISTORY_DIR + instead of KZ_HISTORY_DIR. + + * module/embed/gecko/Makefile.am: removed KZ_XXX macros. + * src/prefs_ui/prefs_history.c: used kz_search_engine_ids() instead of kz_search_engine_names(). Modified: kazehakase/trunk/module/embed/gecko/Makefile.am =================================================================== --- kazehakase/trunk/module/embed/gecko/Makefile.am 2007-03-27 06:08:20 UTC (rev 3050) +++ kazehakase/trunk/module/embed/gecko/Makefile.am 2007-03-27 06:18:30 UTC (rev 3051) @@ -122,19 +122,13 @@ -export-dynamic $(no_undefined) \ $(LIBTOOL_EXPORT_OPTIONS) -gecko_la_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 \ - -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \ - -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \ - -DGECKO_VERSION=\"$(GECKO_VERSION)\" \ - -DG_LOG_DOMAIN=\"Kazehakase-Gecko\" \ +gecko_la_CPPFLAGS = \ + -DGTK_DISABLE_DEPRECATED=1 \ + -DGDK_DISABLE_DEPRECATED=1 \ + -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \ + -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \ + -DGECKO_VERSION=\"$(GECKO_VERSION)\" \ + -DG_LOG_DOMAIN=\"Kazehakase-Gecko\" \ -DG_DISABLE_DEPRECATED=1 EXTRA_DIST= \ Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp =================================================================== --- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2007-03-27 06:08:20 UTC (rev 3050) +++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2007-03-27 06:18:30 UTC (rev 3051) @@ -1116,8 +1116,7 @@ KZ_CONF_GET("Global", "create_thumbnail", create_thumbnail, BOOL); KZ_CONF_GET("History", "store_cache", store_cache, BOOL); - gchar *cache = g_strconcat("file://", g_get_home_dir(), - HISTORY_DIR, NULL); + gchar *cache = g_strconcat("file://", KZ_GET_HISTORY_DIR, NULL); const gchar *location = kz_gecko_embed_get_location(KZ_EMBED(kzembed)); if (location && (g_str_has_prefix(location, "http:") ||