svnno****@sourc*****
svnno****@sourc*****
Tue Mar 27 09:55:21 JST 2007
Revision: 3036 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3036 Author: kous Date: 2007-03-27 09:55:21 +0900 (Tue, 27 Mar 2007) Log Message: ----------- * src/kz-app.[ch], src/kazehakase.h: added popup directory API. Modified Paths: -------------- kazehakase/trunk/ChangeLog kazehakase/trunk/src/kazehakase.h kazehakase/trunk/src/kz-app.c kazehakase/trunk/src/kz-app.h Modified: kazehakase/trunk/ChangeLog =================================================================== --- kazehakase/trunk/ChangeLog 2007-03-27 00:46:36 UTC (rev 3035) +++ kazehakase/trunk/ChangeLog 2007-03-27 00:55:21 UTC (rev 3036) @@ -1,5 +1,7 @@ 2007-03-27 Kouhei Sutou <kou****@cozmi*****> + * src/kz-app.[ch], src/kazehakase.h: added popup directory API. + * src/utils/utils.[ch]: clean-up history purging related API. * src/utils/Makefile.am, src/utils/kz-history-utils.[ch]: added. Modified: kazehakase/trunk/src/kazehakase.h =================================================================== --- kazehakase/trunk/src/kazehakase.h 2007-03-27 00:46:36 UTC (rev 3035) +++ kazehakase/trunk/src/kazehakase.h 2007-03-27 00:55:21 UTC (rev 3036) @@ -71,6 +71,7 @@ #define KZ_GET_HISTORY_DIR kz_app_get_history_dir(kz_app) #define KZ_GET_HISTORY_TIME_STAMP kz_app_get_history_time_stamp(kz_app) +#define KZ_GET_POPUP_DIR kz_app_get_popup_dir(kz_app) #define KZ_SET_SEARCH(engine_name) kz_app_set_search(kz_app, engine_name) Modified: kazehakase/trunk/src/kz-app.c =================================================================== --- kazehakase/trunk/src/kz-app.c 2007-03-27 00:46:36 UTC (rev 3035) +++ kazehakase/trunk/src/kz-app.c 2007-03-27 00:55:21 UTC (rev 3036) @@ -82,6 +82,7 @@ gchar *history_dir; gchar *history_time_stamp; + gchar *popup_dir; }; #define KZ_APP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_APP, KzAppPrivate)) @@ -250,6 +251,7 @@ priv->history_time_stamp = g_build_filename(priv->history_dir, "time-stamp", NULL); + priv->popup_dir = g_build_filename(g_get_home_dir(), IMAGE_DIR, NULL); priv->window_list = NULL; priv->favicon = kz_favicon_get_instance(); @@ -356,27 +358,20 @@ static void clean_history_cache (void) { - guint limit_days = 30; gboolean limit = FALSE; - time_t limit_seconds; - KZ_CONF_GET("History", "limit_days", limit_days, INT); KZ_CONF_GET("History", "limit_cache", limit, BOOL); if (limit) { - gchar *image_dir; + guint limit_days = 30; + time_t limit_seconds; + KZ_CONF_GET("History", "limit_days", limit_days, INT); limit_seconds = limit_days * 86400; if (!kz_history_time_stamp_exists()) kz_history_make_time_stamp(); kz_history_purge_by_time_stamp(limit_seconds); - - /* purge popup files */ - image_dir = g_build_filename(g_get_home_dir(), - IMAGE_DIR, - NULL); - kz_utils_purge_files(image_dir, limit_seconds); - g_free(image_dir); + kz_utils_purge_files(KZ_GET_POPUP_DIR, limit_seconds); } } @@ -427,9 +422,11 @@ g_free(priv->history_dir); g_free(priv->history_time_stamp); + g_free(priv->popup_dir); priv->history_dir = NULL; priv->history_time_stamp = NULL; + priv->popup_dir = NULL; priv->profile = NULL; priv->proxy = NULL; @@ -1039,3 +1036,11 @@ return KZ_APP_GET_PRIVATE(app)->history_time_stamp; } +const gchar * +kz_app_get_popup_dir (KzApp *app) +{ + g_return_val_if_fail(KZ_IS_APP(app), NULL); + + return KZ_APP_GET_PRIVATE(app)->popup_dir; +} + Modified: kazehakase/trunk/src/kz-app.h =================================================================== --- kazehakase/trunk/src/kz-app.h 2007-03-27 00:46:36 UTC (rev 3035) +++ kazehakase/trunk/src/kz-app.h 2007-03-27 00:55:21 UTC (rev 3036) @@ -87,6 +87,7 @@ const gchar *kz_app_get_history_dir (KzApp *app); const gchar *kz_app_get_history_time_stamp (KzApp *app); +const gchar *kz_app_get_popup_dir (KzApp *app); G_END_DECLS