geeqie: src/editors.c comparison

comparison src/editors.c @ 1736:8e64965c1d92

load desktop files in idle time - scanning all desktop files takes a lot of time because of hdd seek - this change moves the scanning to idle time - the editors appears in the menus some time after startup https://sourceforge.net/tracker/index.php?func=detail&aid=2852522&group_id=222125&atid=1054680

author	nadvornik
date	Sun, 06 Sep 2009 14:01:03 +0000
parents	58a5d1e01e33
children	eb64f542341b

comparison

equal deleted inserted replaced

-:6cae2af8fdd1
+:8e64965c1d92
 #include "editors.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "misc.h"
+#include "pixbuf_util.h"
 #include "ui_fileops.h"
 #include "ui_spinner.h"
 #include "ui_utildlg.h"
 #include "utilops.h"
 *-----------------------------------------------------------------------------
 */
 GHashTable *editors = NULL;
 GtkListStore *desktop_file_list;
+gboolean editors_finished = FALSE;
 #ifdef G_KEY_FILE_DESKTOP_GROUP
 #define DESKTOP_GROUP G_KEY_FILE_DESKTOP_GROUP
 #else
 #define DESKTOP_GROUP "Desktop Entry"
 				list = g_list_concat(list, filter_to_list(conv_table[j][1]));
 	return list;
 }
-static gboolean editor_read_desktop_file(const gchar *path)
+gboolean editor_read_desktop_file(const gchar *path)
 {
 	GKeyFile *key_file;
 	EditorDescription *editor;
 	gchar *extensions;
 	gchar *type;
 			// drop extension
 			*ext = '\0';
 			}
 		}
+	if (editor->icon && !register_theme_icon_as_stock(editor->key, editor->icon))
+		{
+		g_free(editor->icon);
+		editor->icon = NULL;
+		}
 	editor->exec = g_key_file_get_string(key_file, DESKTOP_GROUP, "Exec", NULL);
 	editor->menu_path = g_key_file_get_string(key_file, DESKTOP_GROUP, "X-Geeqie-Menu-Path", NULL);
 	if (!editor->menu_path) editor->menu_path = g_strdup("EditMenu/ExternalMenu");
 {
 	EditorDescription *editor = value;
 	return editor->hidden || editor->ignored;
 }
-static void editor_read_desktop_dir(const gchar *path)
+void editor_table_finish(void)
+{
+	g_hash_table_foreach_remove(editors, editor_remove_desktop_file_cb, NULL);
+	editors_finished = TRUE;
+}
+void editor_table_clear(void)
+{
+	if (desktop_file_list)
+		{
+		gtk_list_store_clear(desktop_file_list);
+		}
+	else
+		{
+		desktop_file_list = gtk_list_store_new(DESKTOP_FILE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING);
+		}
+	if (editors)
+		{
+		g_hash_table_destroy(editors);
+		}
+	editors = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)editor_description_free);
+	editors_finished = FALSE;
+}
+static GList *editor_add_desktop_dir(GList *list, const gchar *path)
 {
 	DIR *dp;
 	struct dirent *dir;
 	gchar *pathl;
 	dp = opendir(pathl);
 	g_free(pathl);
 	if (!dp)
 		{
 		/* dir not found */
-		return;
+		return list;
 		}
 	while ((dir = readdir(dp)) != NULL)
 		{
 		gchar *namel = dir->d_name;
 		if (g_str_has_suffix(namel, ".desktop"))
 			{
 			gchar *name = path_to_utf8(namel);
 			gchar *dpath = g_build_filename(path, name, NULL);
-			editor_read_desktop_file(dpath);
+			list = g_list_prepend(list, dpath);
-			g_free(dpath);
 			g_free(name);
 			}
 		}
 	closedir(dp);
-}
+	return list;
+}
-void editor_load_descriptions(void)
+GList *editor_get_desktop_files(void)
 {
 	gchar *path;
 	gchar *xdg_data_dirs;
 	gchar *all_dirs;
 	gchar **split_dirs;
 	gint i;
+	GList *list = NULL;
-	if (desktop_file_list)
-		{
-		gtk_list_store_clear(desktop_file_list);
-		}
-	else
-		{
-		desktop_file_list = gtk_list_store_new(DESKTOP_FILE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING);
-		}
-	if (editors)
-		{
-		g_hash_table_destroy(editors);
-		}
-	editors = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)editor_description_free);
 	xdg_data_dirs = getenv("XDG_DATA_DIRS");
 	if (xdg_data_dirs && xdg_data_dirs[0])
 		xdg_data_dirs = path_to_utf8(xdg_data_dirs);
 	else
 		xdg_data_dirs = g_strdup("/usr/share");
 	split_dirs = g_strsplit(all_dirs, ":", 0);
 	g_free(all_dirs);
-	for (i = 0; split_dirs[i]; i++)
+	for (i = 0; split_dirs[i]; i++);
+	for (--i; i >= 0; i--)
 		{
 		path = g_build_filename(split_dirs[i], "applications", NULL);
-		editor_read_desktop_dir(path);
+		list = editor_add_desktop_dir(list, path);
 		g_free(path);
 		}
 	g_strfreev(split_dirs);
+	return g_list_reverse(list);
-	g_hash_table_foreach_remove(editors, editor_remove_desktop_file_cb, NULL);
 }
 static void editor_list_add_cb(gpointer key, gpointer value, gpointer data)
 {
 	GList **listp = data;
 }
 GList *editor_list_get(void)
 {
 	GList *editors_list = NULL;
+	if (!editors_finished) return NULL;
 	g_hash_table_foreach(editors, editor_list_add_cb, &editors_list);
 	editors_list = g_list_sort(editors_list, editor_sort);
 	return editors_list;
 }

Mercurial > geeqie

comparison src/editors.c @ 1736:8e64965c1d92