Mercurial > geeqie.yaz
diff src/cache_maint.c @ 1145:3a7af6a8cd5f
Use functions to return directories instead of constants.
Following functions were added:
get_collections_dir()
get_metadata_cache_dir()
get_rc_dir()
get_thumbnails_cache_dir()
get_trash_dir()
They return the full directory path.
author | zas_ |
---|---|
date | Sat, 15 Nov 2008 17:30:45 +0000 |
parents | ba2a41f053e6 |
children | 95860439070b |
line wrap: on
line diff
--- a/src/cache_maint.c Sat Nov 15 10:35:43 2008 +0000 +++ b/src/cache_maint.c Sat Nov 15 17:30:45 2008 +0000 @@ -143,20 +143,17 @@ gboolean still_have_a_file = TRUE; gsize base_length; const gchar *cache_folder; - gchar *base; if (cm->metadata) { - cache_folder = GQ_CACHE_RC_METADATA; + cache_folder = get_metadata_cache_dir(); } else { - cache_folder = GQ_CACHE_RC_THUMB; + cache_folder = get_thumbnails_cache_dir(); } - base = g_build_filename(homedir(), cache_folder, NULL); - base_length = strlen(base); - g_free(base); + base_length = strlen(cache_folder); if (!cm->list) { @@ -276,7 +273,6 @@ { CMData *cm; GList *dlist; - gchar *base; FileData *dir_fd; const gchar *msg; const gchar *cache_folder; @@ -284,24 +280,21 @@ if (metadata) { - cache_folder = GQ_CACHE_RC_METADATA; + cache_folder = get_metadata_cache_dir(); } else { - cache_folder = GQ_CACHE_RC_THUMB; + cache_folder = get_thumbnails_cache_dir(); } - base = g_build_filename(homedir(), cache_folder, NULL); - dir_fd = file_data_new_simple(base); + dir_fd = file_data_new_simple(cache_folder); if (!filelist_read(dir_fd, NULL, &dlist)) { - g_free(base); file_data_unref(dir_fd); return; } dlist = g_list_append(dlist, dir_fd); - g_free(base); cm = g_new0(CMData, 1); cm->list = dlist; @@ -1246,7 +1239,7 @@ group = pref_group_new(gd->vbox, FALSE, _("Thumbnail cache"), GTK_ORIENTATION_VERTICAL); - cache_manager_location_label(group, GQ_CACHE_RC_THUMB); + cache_manager_location_label(group, get_thumbnails_cache_dir()); table = pref_table_new(group, 2, 2, FALSE, FALSE); @@ -1288,7 +1281,7 @@ group = pref_group_new(gd->vbox, FALSE, _("Metadata"), GTK_ORIENTATION_VERTICAL); - cache_manager_location_label(group, GQ_CACHE_RC_METADATA); + cache_manager_location_label(group, get_metadata_cache_dir()); table = pref_table_new(group, 2, 1, FALSE, FALSE);