From cfe12efb5ec9586dab6961f141d52b103bd8b1d1 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 22 Nov 2010 13:57:13 +0000 Subject: Meta: Recipe Reogranization This is the next stage of recipe reorganization, in this stage many recipes where moved to a new meta-demoapps layer since this is more appropriate for demo usage then the core. Additional some recipes were moved to meta-extras to indicate they may be depercated at a future time. A number of recipes were modified since dependencies need to be corrected. Signed-off-by: Saul Wold --- .../gnome-settings-daemon/mojito-cleanup.patch | 74 ---------------------- 1 file changed, 74 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch (limited to 'meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch') diff --git a/meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch deleted file mode 100644 index 1aff2d6d6f..0000000000 --- a/meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c -index f84cfad..e8f474a 100644 ---- a/plugins/housekeeping/gsd-housekeeping-manager.c -+++ b/plugins/housekeeping/gsd-housekeeping-manager.c -@@ -85,9 +85,13 @@ thumb_data_free (gpointer data) - } - } - -+typedef enum { -+ HASH, -+ HASH_PNG -+} FileType; - - static GList * --read_dir_for_purge (const char *path, GList *files) -+read_dir_for_purge (const char *path, GList *files, FileType type) - { - GFile *read_path; - GFileEnumerator *enum_dir; -@@ -105,9 +109,20 @@ read_dir_for_purge (const char *path, GList *files) - GFileInfo *info; - while ((info = g_file_enumerator_next_file (enum_dir, NULL, NULL)) != NULL) { - const char *name; -+ gboolean prune = FALSE; -+ - name = g_file_info_get_name (info); - -- if (strlen (name) == 36 && strcmp (name + 32, ".png") == 0) { -+ switch (type) { -+ case HASH: -+ prune = (strlen (name) == 36); -+ break; -+ case HASH_PNG: -+ prune = (strlen (name) == 36 && strcmp (name + 32, ".png") == 0); -+ break; -+ } -+ -+ if (prune) { - ThumbData *td; - GFile *entry; - char *entry_path; -@@ -197,14 +212,14 @@ purge_thumbnail_cache (void) - ".thumbnails", - "normal", - NULL); -- files = read_dir_for_purge (path, NULL); -+ files = read_dir_for_purge (path, NULL, HASH_PNG); - g_free (path); - - path = g_build_filename (g_get_home_dir (), - ".thumbnails", - "large", - NULL); -- files = read_dir_for_purge (path, files); -+ files = read_dir_for_purge (path, files, HASH_PNG); - g_free (path); - - path = g_build_filename (g_get_home_dir (), -@@ -212,7 +227,14 @@ purge_thumbnail_cache (void) - "fail", - "gnome-thumbnail-factory", - NULL); -- files = read_dir_for_purge (path, files); -+ files = read_dir_for_purge (path, files, HASH_PNG); -+ g_free (path); -+ -+ path = g_build_filename (g_get_user_cache_dir (), -+ "mojito", -+ "thumbnails", -+ NULL); -+ files = read_dir_for_purge (path, files, HASH); - g_free (path); - - g_get_current_time (¤t_time); -- cgit v1.2.3-54-g00ecf