# HG changeset patch
# User zas_
# Date 1207696572 0
# Node ID e213fb0256216ff43d4670fc7055acf947638393
# Parent  c2cb12def9d6a1201bfdb095eb9e9ae6f727da7d
GQVIEW_* -> GQ_*

diff -r c2cb12def9d6 -r e213fb025621 configure.in
--- a/configure.in	Tue Apr 08 23:07:09 2008 +0000
+++ b/configure.in	Tue Apr 08 23:16:12 2008 +0000
@@ -20,8 +20,8 @@
 
 AM_PATH_GTK_2_0(2.4.0,,AC_MSG_ERROR(GTK+ >= 2.4.0 not installed.))
 
-AC_DEFINE_UNQUOTED(GQVIEW_HELPDIR, "$prefix/share/doc/geeqie-$VERSION", [Location of documentation files])
-AC_DEFINE_UNQUOTED(GQVIEW_HTMLDIR, "$prefix/share/doc/geeqie-$VERSION/html", [Location of html documentation])
+AC_DEFINE_UNQUOTED(GQ_HELPDIR, "$prefix/share/doc/geeqie-$VERSION", [Location of documentation files])
+AC_DEFINE_UNQUOTED(GQ_HTMLDIR, "$prefix/share/doc/geeqie-$VERSION/html", [Location of html documentation])
 
 dnl checks for functions
 AC_CHECK_FUNCS(strverscmp access fsync fflush)
@@ -68,7 +68,7 @@
 GETTEXT_PACKAGE=$PACKAGE
 AC_SUBST(GETTEXT_PACKAGE)
 AM_GLIB_GNU_GETTEXT
-AM_GLIB_DEFINE_LOCALEDIR(GQVIEW_LOCALEDIR)
+AM_GLIB_DEFINE_LOCALEDIR(GQ_LOCALEDIR)
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
diff -r c2cb12def9d6 -r e213fb025621 src/bar_info.c
--- a/src/bar_info.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/bar_info.c	Tue Apr 08 23:16:12 2008 +0000
@@ -102,7 +102,7 @@
 		if (cache_ensure_dir_exists(comment_dir, mode))
 			{
 			comment_path = g_strconcat(comment_dir, "/", fd->name,
-						   GQVIEW_CACHE_EXT_METADATA, NULL);
+						   GQ_CACHE_EXT_METADATA, NULL);
 			}
 		g_free(comment_dir);
 		}
diff -r c2cb12def9d6 -r e213fb025621 src/bar_sort.c
--- a/src/bar_sort.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/bar_sort.c	Tue Apr 08 23:16:12 2008 +0000
@@ -95,7 +95,7 @@
 	history_list_free_key(SORT_KEY_COLLECTIONS);
 	bookmark_list_set_key(bookmarks, SORT_KEY_COLLECTIONS);
 
-	collect_path = g_strconcat(homedir(), "/", GQVIEW_RC_DIR_COLLECTIONS, NULL);
+	collect_path = g_strconcat(homedir(), "/", GQ_RC_DIR_COLLECTIONS, NULL);
 	path_list(collect_path, &list, NULL);
 	g_free(collect_path);
 
@@ -429,7 +429,7 @@
 			ext = ".gqv";
 			}
 
-		path = g_strconcat(homedir(), "/", GQVIEW_RC_DIR_COLLECTIONS, "/", name, ext, NULL);
+		path = g_strconcat(homedir(), "/", GQ_RC_DIR_COLLECTIONS, "/", name, ext, NULL);
 		if (isfile(path))
 			{
 			gchar *text = g_strdup_printf(_("The collection:\n%s\nalready exists."), name);
diff -r c2cb12def9d6 -r e213fb025621 src/cache.c
--- a/src/cache.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/cache.c	Tue Apr 08 23:16:12 2008 +0000
@@ -620,19 +620,19 @@
 	switch (type)
 		{
 		case CACHE_TYPE_THUMB:
-			*cache_rc = GQVIEW_CACHE_RC_THUMB;
-			*cache_local = GQVIEW_CACHE_LOCAL_THUMB;
-			*cache_ext = GQVIEW_CACHE_EXT_THUMB;
+			*cache_rc = GQ_CACHE_RC_THUMB;
+			*cache_local = GQ_CACHE_LOCAL_THUMB;
+			*cache_ext = GQ_CACHE_EXT_THUMB;
 			break;
 		case CACHE_TYPE_SIM:
-			*cache_rc = GQVIEW_CACHE_RC_THUMB;
-			*cache_local = GQVIEW_CACHE_LOCAL_THUMB;
-			*cache_ext = GQVIEW_CACHE_EXT_SIM;
+			*cache_rc = GQ_CACHE_RC_THUMB;
+			*cache_local = GQ_CACHE_LOCAL_THUMB;
+			*cache_ext = GQ_CACHE_EXT_SIM;
 			break;
 		case CACHE_TYPE_METADATA:
-			*cache_rc = GQVIEW_CACHE_RC_METADATA;
-			*cache_local = GQVIEW_CACHE_LOCAL_METADATA;
-			*cache_ext = GQVIEW_CACHE_EXT_METADATA;
+			*cache_rc = GQ_CACHE_RC_METADATA;
+			*cache_local = GQ_CACHE_LOCAL_METADATA;
+			*cache_ext = GQ_CACHE_EXT_METADATA;
 			break;
 		}
 }
diff -r c2cb12def9d6 -r e213fb025621 src/cache.h
--- a/src/cache.h	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/cache.h	Tue Apr 08 23:16:12 2008 +0000
@@ -17,15 +17,15 @@
 #include "similar.h"
 
 
-#define GQVIEW_CACHE_RC_THUMB       GQVIEW_RC_DIR"/thumbnails"
-#define GQVIEW_CACHE_RC_METADATA    GQVIEW_RC_DIR"/metadata"
+#define GQ_CACHE_RC_THUMB       GQ_RC_DIR"/thumbnails"
+#define GQ_CACHE_RC_METADATA    GQ_RC_DIR"/metadata"
 
-#define GQVIEW_CACHE_LOCAL_THUMB    ".thumbnails"
-#define GQVIEW_CACHE_LOCAL_METADATA ".metadata"
+#define GQ_CACHE_LOCAL_THUMB    ".thumbnails"
+#define GQ_CACHE_LOCAL_METADATA ".metadata"
 
-#define GQVIEW_CACHE_EXT_THUMB      ".png"
-#define GQVIEW_CACHE_EXT_SIM        ".sim"
-#define GQVIEW_CACHE_EXT_METADATA   ".meta"
+#define GQ_CACHE_EXT_THUMB      ".png"
+#define GQ_CACHE_EXT_SIM        ".sim"
+#define GQ_CACHE_EXT_METADATA   ".meta"
 
 
 typedef enum {
diff -r c2cb12def9d6 -r e213fb025621 src/cache_maint.c
--- a/src/cache_maint.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/cache_maint.c	Tue Apr 08 23:16:12 2008 +0000
@@ -143,11 +143,11 @@
 
 	if (cm->metadata)
 		{
-		cache_folder = GQVIEW_CACHE_RC_METADATA;
+		cache_folder = GQ_CACHE_RC_METADATA;
 		}
 	else
 		{
-		cache_folder = GQVIEW_CACHE_RC_THUMB;
+		cache_folder = GQ_CACHE_RC_THUMB;
 		}
 
 	base_length = strlen(homedir()) + strlen("/") + strlen(cache_folder);
@@ -275,11 +275,11 @@
 
 	if (metadata)
 		{
-		cache_folder = GQVIEW_CACHE_RC_METADATA;
+		cache_folder = GQ_CACHE_RC_METADATA;
 		}
 	else
 		{
-		cache_folder = GQVIEW_CACHE_RC_THUMB;
+		cache_folder = GQ_CACHE_RC_THUMB;
 		}
 
 	base = g_strconcat(homedir(), "/", cache_folder, NULL);
@@ -358,8 +358,8 @@
 
 	if (debug) printf("maintainance check: %s\n", dir);
 
-	base_length = strlen(homedir()) + strlen("/") + strlen(GQVIEW_CACHE_RC_THUMB);
-	base = g_strconcat(homedir(), "/", GQVIEW_CACHE_RC_THUMB, dir, NULL);
+	base_length = strlen(homedir()) + strlen("/") + strlen(GQ_CACHE_RC_THUMB);
+	base = g_strconcat(homedir(), "/", GQ_CACHE_RC_THUMB, dir, NULL);
 
 	if (path_list(base, &flist, &dlist))
 		{
@@ -426,7 +426,7 @@
 	gint still_have_a_file = FALSE;
 	GList *work;
 
-	cachedir = g_strconcat(dir, "/", GQVIEW_CACHE_LOCAL_THUMB, NULL);
+	cachedir = g_strconcat(dir, "/", GQ_CACHE_LOCAL_THUMB, NULL);
 
 	path_list(cachedir, &list, NULL);
 	work = list;
@@ -442,8 +442,8 @@
 		source = g_strconcat(dir, "/", filename_from_path(path), NULL);
 
 		if (clear ||
-		    extension_truncate(source, GQVIEW_CACHE_EXT_THUMB) ||
-		    extension_truncate(source, GQVIEW_CACHE_EXT_SIM))
+		    extension_truncate(source, GQ_CACHE_EXT_THUMB) ||
+		    extension_truncate(source, GQ_CACHE_EXT_SIM))
 			{
 			if (!clear && isfile(source))
 				{
@@ -1177,7 +1177,7 @@
 
 	group = pref_group_new(gd->vbox, FALSE, _("Geeqie thumbnail cache"), GTK_ORIENTATION_VERTICAL);
 
-	buf = g_strconcat(_("Location:"), " ", homedir(), "/", GQVIEW_CACHE_RC_THUMB, NULL);
+	buf = g_strconcat(_("Location:"), " ", homedir(), "/", GQ_CACHE_RC_THUMB, NULL);
 	label = pref_label_new(group, buf);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	g_free(buf);
@@ -1225,7 +1225,7 @@
 
 	group = pref_group_new(gd->vbox, FALSE, _("Metadata"), GTK_ORIENTATION_VERTICAL);
 	
-	buf = g_strconcat(_("Location:"), " ", homedir(), "/", GQVIEW_CACHE_RC_METADATA, NULL);
+	buf = g_strconcat(_("Location:"), " ", homedir(), "/", GQ_CACHE_RC_METADATA, NULL);
 	label = pref_label_new(group, buf);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	g_free(buf);
diff -r c2cb12def9d6 -r e213fb025621 src/collect-dlg.c
--- a/src/collect-dlg.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/collect-dlg.c	Tue Apr 08 23:16:12 2008 +0000
@@ -198,7 +198,7 @@
 	generic_dialog_add_message(GENERIC_DIALOG(fd), NULL, title, NULL);
 	file_dialog_add_button(fd, stock_id, btntext, btnfunc, TRUE);
 
-	base = g_strconcat(homedir(), "/", GQVIEW_RC_DIR_COLLECTIONS, NULL);
+	base = g_strconcat(homedir(), "/", GQ_RC_DIR_COLLECTIONS, NULL);
 	file_dialog_add_path_widgets(fd, base, path,
 				     "collection_load_save", ".gqv", _("Collection Files"));
 	g_free(base);
diff -r c2cb12def9d6 -r e213fb025621 src/collect-io.c
--- a/src/collect-io.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/collect-io.c	Tue Apr 08 23:16:12 2008 +0000
@@ -21,10 +21,10 @@
 #include "filelist.h"
 
 
-#define GQVIEW_COLLECTION_MARKER "#Geeqie"
+#define GQ_COLLECTION_MARKER "#Geeqie"
 
-#define GQVIEW_COLLECTION_FAIL_MIN     300
-#define GQVIEW_COLLECTION_FAIL_PERCENT 98
+#define GQ_COLLECTION_FAIL_MIN     300
+#define GQ_COLLECTION_FAIL_PERCENT 98
 
 typedef struct _CollectManagerEntry CollectManagerEntry;
 
@@ -94,7 +94,7 @@
 		gchar *buf;
 		if (s_buf[0]=='#')
 			{
-			if (strncasecmp(s_buf, GQVIEW_COLLECTION_MARKER, strlen(GQVIEW_COLLECTION_MARKER)) == 0)
+			if (strncasecmp(s_buf, GQ_COLLECTION_MARKER, strlen(GQ_COLLECTION_MARKER)) == 0)
 				{
 				/* Looks like an official collection, allow unchecked input.
 				 * All this does is allow adding files that may not exist,
@@ -127,8 +127,8 @@
 			if (!valid && !official)
 				{
 				fail++;
-				if (fail > GQVIEW_COLLECTION_FAIL_MIN &&
-				    fail * 100 / total > GQVIEW_COLLECTION_FAIL_PERCENT)
+				if (fail > GQ_COLLECTION_FAIL_MIN &&
+				    fail * 100 / total > GQ_COLLECTION_FAIL_PERCENT)
 					{
 					printf("Too many invalid filenames in unoffical collection file, closing: %s\n", path);
 					success = FALSE;
@@ -310,7 +310,7 @@
 		return FALSE;
 		}
 
-	fprintf(f, "%s collection\n", GQVIEW_COLLECTION_MARKER);
+	fprintf(f, "%s collection\n", GQ_COLLECTION_MARKER);
 	fprintf(f, "#created with Geeqie version %s\n", VERSION);
 
 	collection_update_geometry(cd);
@@ -675,7 +675,7 @@
 	GList *work;
 	gchar *base;
 
-	base = g_strconcat(homedir(), "/", GQVIEW_RC_DIR_COLLECTIONS, NULL);
+	base = g_strconcat(homedir(), "/", GQ_RC_DIR_COLLECTIONS, NULL);
 	path_list(base, &list, NULL);
 	g_free(base);
 
diff -r c2cb12def9d6 -r e213fb025621 src/editors.c
--- a/src/editors.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/editors.c	Tue Apr 08 23:16:12 2008 +0000
@@ -55,7 +55,7 @@
 };
 
 
-static gchar *editor_slot_defaults[GQVIEW_EDITOR_SLOTS * 2] = {
+static gchar *editor_slot_defaults[GQ_EDITOR_SLOTS * 2] = {
 	N_("The Gimp"), "gimp-remote -n %{.cr2;.crw;.nef;.raw;*}f",
 	N_("XV"), "xv %f",
 	N_("Xpaint"), "xpaint %f",
@@ -98,7 +98,7 @@
 {
 	gint i;
 
-	for (i = 0; i < GQVIEW_EDITOR_SLOTS; i++)
+	for (i = 0; i < GQ_EDITOR_SLOTS; i++)
 		{
 		g_free(editor_name[i]);
 		editor_name[i] = g_strdup(_(editor_slot_defaults[i * 2]));
@@ -784,7 +784,7 @@
 	gchar *command;
 	gint error;
 
-	if (n < 0 || n >= GQVIEW_EDITOR_SLOTS || !list ||
+	if (n < 0 || n >= GQ_EDITOR_SLOTS || !list ||
 	    !editor_command[n] ||
 	    strlen(editor_command[n]) == 0) return FALSE;
 
@@ -820,7 +820,7 @@
 
 gint editor_window_flag_set(gint n)
 {
-	if (n < 0 || n >= GQVIEW_EDITOR_SLOTS ||
+	if (n < 0 || n >= GQ_EDITOR_SLOTS ||
 	    !editor_command[n] ||
 	    strlen(editor_command[n]) == 0) return TRUE;
 
diff -r c2cb12def9d6 -r e213fb025621 src/filelist.c
--- a/src/filelist.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/filelist.c	Tue Apr 08 23:16:12 2008 +0000
@@ -434,8 +434,8 @@
 
 		if ((!show_dot_files && ishidden(base)) ||
 		    (!is_dir_list && !filter_name_exists(base)) ||
-		    (is_dir_list && base[0] == '.' && (strcmp(base, GQVIEW_CACHE_LOCAL_THUMB) == 0 ||
-						       strcmp(base, GQVIEW_CACHE_LOCAL_METADATA) == 0)) )
+		    (is_dir_list && base[0] == '.' && (strcmp(base, GQ_CACHE_LOCAL_THUMB) == 0 ||
+						       strcmp(base, GQ_CACHE_LOCAL_METADATA) == 0)) )
 			{
 			GList *link = work;
 			work = work->next;
@@ -1231,8 +1231,8 @@
 					/* we ignore the .thumbnails dir for cleanliness */
 					if ((dirs) &&
 					    !(name[0] == '.' && (name[1] == '\0' || (name[1] == '.' && name[2] == '\0'))) &&
-					    strcmp(name, GQVIEW_CACHE_LOCAL_THUMB) != 0 &&
-					    strcmp(name, GQVIEW_CACHE_LOCAL_METADATA) != 0 &&
+					    strcmp(name, GQ_CACHE_LOCAL_THUMB) != 0 &&
+					    strcmp(name, GQ_CACHE_LOCAL_METADATA) != 0 &&
 					    strcmp(name, THUMB_FOLDER_LOCAL) != 0)
 						{
 						dlist = g_list_prepend(dlist, file_data_new_local(filepath, &ent_sbuf, FALSE));
@@ -1358,8 +1358,8 @@
 
 		if ((!show_dot_files && ishidden(name)) ||
 		    (!is_dir_list && !filter_name_exists(name)) ||
-		    (is_dir_list && name[0] == '.' && (strcmp(name, GQVIEW_CACHE_LOCAL_THUMB) == 0 ||
-						       strcmp(name, GQVIEW_CACHE_LOCAL_METADATA) == 0)) )
+		    (is_dir_list && name[0] == '.' && (strcmp(name, GQ_CACHE_LOCAL_THUMB) == 0 ||
+						       strcmp(name, GQ_CACHE_LOCAL_METADATA) == 0)) )
 			{
 			GList *link = work;
 			work = work->next;
diff -r c2cb12def9d6 -r e213fb025621 src/globals.c
--- a/src/globals.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/globals.c	Tue Apr 08 23:16:12 2008 +0000
@@ -64,8 +64,8 @@
 gint enable_metadata_dirs = FALSE;
 gint show_dot_files = FALSE;
 gint file_filter_disable = FALSE;
-gchar *editor_name[GQVIEW_EDITOR_SLOTS];
-gchar *editor_command[GQVIEW_EDITOR_SLOTS];
+gchar *editor_name[GQ_EDITOR_SLOTS];
+gchar *editor_command[GQ_EDITOR_SLOTS];
 
 gint thumbnails_enabled = FALSE;
 SortType file_sort_method = SORT_NAME;
diff -r c2cb12def9d6 -r e213fb025621 src/main.c
--- a/src/main.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/main.c	Tue Apr 08 23:16:12 2008 +0000
@@ -202,7 +202,7 @@
 		return;
 		}
 
-	help_browser_command(result, GQVIEW_HTMLDIR "/index.html");
+	help_browser_command(result, GQ_HTMLDIR "/index.html");
 
 	g_free(result);
 }
@@ -236,7 +236,7 @@
 		}
 
 	help_window = help_window_new(_("Help - Geeqie"), GQ_WMCLASS, "help",
-                                      GQVIEW_HELPDIR "/README", key);
+                                      GQ_HELPDIR "/README", key);
 	g_signal_connect(G_OBJECT(help_window), "destroy",
 			 G_CALLBACK(help_window_destroy_cb), NULL);
 }
@@ -627,7 +627,7 @@
 	gint started = FALSE;
 	gchar *buf;
 
-	buf = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/.command", NULL);
+	buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/.command", NULL);
 	rc = remote_client_open(buf);
 	if (!rc)
 		{
@@ -1072,7 +1072,7 @@
 {
 	gchar *path;
 
-	path = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/", RC_HISTORY_NAME, NULL);
+	path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_HISTORY_NAME, NULL);
 	history_list_load(path);
 	g_free(path);
 }
@@ -1081,7 +1081,7 @@
 {
 	gchar *path;
 
-	path = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/", RC_HISTORY_NAME, NULL);
+	path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_HISTORY_NAME, NULL);
 	history_list_save(path);
 	g_free(path);
 }
@@ -1114,7 +1114,7 @@
 	gchar *path;
 	gint i;
 
-	for (i = 0; i < GQVIEW_EDITOR_SLOTS; i++)
+	for (i = 0; i < GQ_EDITOR_SLOTS; i++)
 		{
 		editor_name[i] = NULL;
 		editor_command[i] = NULL;
@@ -1126,12 +1126,12 @@
 	path = concat_dir_and_file(homedir(), "Desktop");
 	bookmark_add_default(_("Desktop"), path);
 	g_free(path);
-	path = concat_dir_and_file(homedir(), GQVIEW_RC_DIR_COLLECTIONS);
+	path = concat_dir_and_file(homedir(), GQ_RC_DIR_COLLECTIONS);
 	bookmark_add_default(_("Collections"), path);
 	g_free(path);
 
 	g_free(safe_delete_path);
-	safe_delete_path = concat_dir_and_file(homedir(), GQVIEW_RC_DIR_TRASH);
+	safe_delete_path = concat_dir_and_file(homedir(), GQ_RC_DIR_TRASH);
 
 	for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
 		{
@@ -1188,7 +1188,7 @@
 	save_options();
 	keys_save();
 
-	path = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/accels", NULL);
+	path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);
 	pathl = path_from_utf8(path);
 	gtk_accel_map_save(pathl);
 	g_free(pathl);
@@ -1268,7 +1268,7 @@
 
 	/* setup locale, i18n */
 	gtk_set_locale();
-	bindtextdomain(PACKAGE, GQVIEW_LOCALEDIR);
+	bindtextdomain(PACKAGE, GQ_LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
 	textdomain(PACKAGE);
 
@@ -1302,16 +1302,16 @@
 		print_term("!!! Geeqie may quit unexpectedly with a relocation error.\n");
 		}
 
-	check_for_home_path(GQVIEW_RC_DIR);
-	check_for_home_path(GQVIEW_RC_DIR_COLLECTIONS);
-	check_for_home_path(GQVIEW_CACHE_RC_THUMB);
-	check_for_home_path(GQVIEW_CACHE_RC_METADATA);
+	check_for_home_path(GQ_RC_DIR);
+	check_for_home_path(GQ_RC_DIR_COLLECTIONS);
+	check_for_home_path(GQ_CACHE_RC_THUMB);
+	check_for_home_path(GQ_CACHE_RC_METADATA);
 
 	keys_load();
 	filter_add_defaults();
 	filter_rebuild();
 	
-	buf = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/accels", NULL);
+	buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);
 	bufl = path_from_utf8(buf);
 	gtk_accel_map_load(bufl);
 	g_free(bufl);
@@ -1441,7 +1441,7 @@
 	if (startup_full_screen) layout_image_full_screen_start(lw);
 	if (startup_in_slideshow) layout_image_slideshow_start(lw);
 
-	buf = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/.command", NULL);
+	buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/.command", NULL);
 	remote_connection = remote_server_open(buf);
 	remote_server_subscribe(remote_connection, remote_cb, NULL);
 	g_free(buf);
diff -r c2cb12def9d6 -r e213fb025621 src/main.h
--- a/src/main.h	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/main.h	Tue Apr 08 23:16:12 2008 +0000
@@ -64,9 +64,9 @@
 
 #define GQ_WMCLASS "geeqie"
 
-#define GQVIEW_RC_DIR             ".geeqie"
-#define GQVIEW_RC_DIR_COLLECTIONS GQVIEW_RC_DIR"/collections"
-#define GQVIEW_RC_DIR_TRASH       GQVIEW_RC_DIR"/trash"
+#define GQ_RC_DIR             ".geeqie"
+#define GQ_RC_DIR_COLLECTIONS GQ_RC_DIR"/collections"
+#define GQ_RC_DIR_TRASH       GQ_RC_DIR"/trash"
 
 #define RC_FILE_NAME "geeqierc"
 
@@ -80,7 +80,7 @@
 
 #define MOUSEWHEEL_SCROLL_SIZE 20
 
-#define GQVIEW_EDITOR_GENERIC_SLOTS 10
+#define GQ_EDITOR_GENERIC_SLOTS 10
 
 #define COLOR_PROFILE_INPUTS 4
 
diff -r c2cb12def9d6 -r e213fb025621 src/menu.c
--- a/src/menu.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/menu.c	Tue Apr 08 23:16:12 2008 +0000
@@ -65,7 +65,7 @@
 static void add_edit_items(GtkWidget *menu, GCallback func, GtkAccelGroup *accel_grp)
 {
 	gint i;
-	for (i = 0; i < GQVIEW_EDITOR_SLOTS; i++)
+	for (i = 0; i < GQ_EDITOR_SLOTS; i++)
 		{
 		if (editor_command[i] && strlen(editor_command[i]) > 0)
 			{
diff -r c2cb12def9d6 -r e213fb025621 src/pan-util.c
--- a/src/pan-util.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/pan-util.c	Tue Apr 08 23:16:12 2008 +0000
@@ -202,7 +202,7 @@
 	if (S_ISLNK(st.st_mode) && (ignore_symlinks || pan_is_link_loop(s))) return TRUE;
 
 	n = filename_from_path(s);
-	if (n && strcmp(n, GQVIEW_RC_DIR) == 0) return TRUE;
+	if (n && strcmp(n, GQ_RC_DIR) == 0) return TRUE;
 
 	return FALSE;
 }
diff -r c2cb12def9d6 -r e213fb025621 src/pixbuf-renderer.c
--- a/src/pixbuf-renderer.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/pixbuf-renderer.c	Tue Apr 08 23:16:12 2008 +0000
@@ -19,13 +19,13 @@
 
 
 /* comment this out if not using this from within Geeqie
- * defining GQVIEW_BUILD does these things:
+ * defining GQ_BUILD does these things:
  *   - Sets the shift-click scroller pixbuf to a nice icon instead of a black box
  */
-#define GQVIEW_BUILD 1
-
-
-#ifdef GQVIEW_BUILD
+#define GQ_BUILD 1
+
+
+#ifdef GQ_BUILD
 	#include "pixbuf_util.h"
 #endif
 
@@ -1201,7 +1201,7 @@
 		GdkPixbuf *pixbuf;
 		gint w, h;
 
-#ifdef GQVIEW_BUILD
+#ifdef GQ_BUILD
 		pixbuf = pixbuf_inline(PIXBUF_INLINE_SCROLLER);
 #else
 		pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, 32, 32);
diff -r c2cb12def9d6 -r e213fb025621 src/preferences.c
--- a/src/preferences.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/preferences.c	Tue Apr 08 23:16:12 2008 +0000
@@ -137,8 +137,8 @@
 static GtkWidget *configwindow = NULL;
 static GtkWidget *startup_path_entry;
 static GtkListStore *filter_store = NULL;
-static GtkWidget *editor_name_entry[GQVIEW_EDITOR_SLOTS];
-static GtkWidget *editor_command_entry[GQVIEW_EDITOR_SLOTS];
+static GtkWidget *editor_name_entry[GQ_EDITOR_SLOTS];
+static GtkWidget *editor_command_entry[GQ_EDITOR_SLOTS];
 
 static GtkWidget *layout_widget;
 
@@ -213,9 +213,9 @@
 	gint i;
 	gint refresh = FALSE;
 
-	for(i = 0; i < GQVIEW_EDITOR_SLOTS; i++)
+	for(i = 0; i < GQ_EDITOR_SLOTS; i++)
 		{
-		if (i < GQVIEW_EDITOR_GENERIC_SLOTS)
+		if (i < GQ_EDITOR_GENERIC_SLOTS)
 			{
 			g_free(editor_name[i]);
 			editor_name[i] = NULL;
@@ -768,9 +768,9 @@
 	editor_reset_defaults();
 	if (!configwindow) return;
 
-	for (i = 0; i < GQVIEW_EDITOR_SLOTS; i++)
+	for (i = 0; i < GQ_EDITOR_SLOTS; i++)
 		{
-		if (i < GQVIEW_EDITOR_GENERIC_SLOTS)
+		if (i < GQ_EDITOR_GENERIC_SLOTS)
 			gtk_entry_set_text(GTK_ENTRY(editor_name_entry[i]),
 				   (editor_name[i]) ? editor_name[i] : "");
 		gtk_entry_set_text(GTK_ENTRY(editor_command_entry[i]),
@@ -1184,11 +1184,11 @@
 	label = pref_table_label(table, 2, 0, _("Command Line"), 0.0);
 	pref_label_bold(label, TRUE, FALSE);
 
-	for (i = 0; i < GQVIEW_EDITOR_SLOTS; i++)
+	for (i = 0; i < GQ_EDITOR_SLOTS; i++)
 		{
 		GtkWidget *entry;
 
-		if (i < GQVIEW_EDITOR_GENERIC_SLOTS)
+		if (i < GQ_EDITOR_GENERIC_SLOTS)
 			{
 			gchar *buf;
 			
diff -r c2cb12def9d6 -r e213fb025621 src/rcfile.c
--- a/src/rcfile.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/rcfile.c	Tue Apr 08 23:16:12 2008 +0000
@@ -594,7 +594,7 @@
 	gchar *rc_pathl;
 	gint i;
 
-	rc_path = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/", RC_FILE_NAME, NULL);
+	rc_path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_FILE_NAME, NULL);
 
 	rc_pathl = path_from_utf8(rc_path);
 	ssi = secure_open(rc_pathl);
@@ -763,7 +763,7 @@
 	secure_fprintf(ssi, "# Maximum of 10 programs (external_1 through external_10)\n");
 	secure_fprintf(ssi, "# format: external_n: \"menu name\" \"command line\"\n\n");
 
-	for (i = 0; i < GQVIEW_EDITOR_SLOTS; i++)
+	for (i = 0; i < GQ_EDITOR_SLOTS; i++)
 		{
 		gchar *qname = escquote_value(editor_name[i]);
 		gchar *qcommand = escquote_value(editor_command[i]);
@@ -843,7 +843,7 @@
 	for (i = 0; ExifUIList[i].key; i++)
 		ExifUIList[i].current = ExifUIList[i].default_value;
 
-	rc_path = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/", RC_FILE_NAME, NULL);
+	rc_path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_FILE_NAME, NULL);
 
 	rc_pathl = path_from_utf8(rc_path);
 	f = fopen(rc_pathl,"r");
@@ -1087,7 +1087,7 @@
 		if (strncasecmp(option, "external_", 9) == 0)
 			{
 			i = strtol(option + 9, NULL, 0);
-			if (i > 0 && i <= GQVIEW_EDITOR_SLOTS)
+			if (i > 0 && i <= GQ_EDITOR_SLOTS)
 				{
 				const gchar *ptr;
 				i--;
diff -r c2cb12def9d6 -r e213fb025621 src/search.c
--- a/src/search.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/search.c	Tue Apr 08 23:16:12 2008 +0000
@@ -2138,7 +2138,7 @@
 		/* search metadata */
 
 		g_free(sd->search_path);
-		sd->search_path = g_strconcat(homedir(), "/", GQVIEW_CACHE_RC_METADATA, NULL);
+		sd->search_path = g_strconcat(homedir(), "/", GQ_CACHE_RC_METADATA, NULL);
 
 		search_start(sd);
 		}
diff -r c2cb12def9d6 -r e213fb025621 src/thumb.c
--- a/src/thumb.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/thumb.c	Tue Apr 08 23:16:12 2008 +0000
@@ -52,7 +52,7 @@
 		gchar *pathl;
 
 		cache_path = g_strconcat(cache_dir, "/", filename_from_path(tl->path),
-					 GQVIEW_CACHE_EXT_THUMB, NULL);
+					 GQ_CACHE_EXT_THUMB, NULL);
 
 		if (debug) printf("Saving thumb: %s\n", cache_path);
 
@@ -100,7 +100,7 @@
 		FILE *f;
 
 		cache_path = g_strconcat(cache_dir, "/", filename_from_path(tl->path),
-					 GQVIEW_CACHE_EXT_THUMB, NULL);
+					 GQ_CACHE_EXT_THUMB, NULL);
 
 		if (debug) printf("marking thumb failure: %s\n", cache_path);
 
diff -r c2cb12def9d6 -r e213fb025621 src/typedefs.h
--- a/src/typedefs.h	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/typedefs.h	Tue Apr 08 23:16:12 2008 +0000
@@ -14,12 +14,12 @@
 #define TYPEDEFS_H
 
 typedef enum {
-	CMD_COPY = GQVIEW_EDITOR_GENERIC_SLOTS,
+	CMD_COPY = GQ_EDITOR_GENERIC_SLOTS,
 	CMD_MOVE,
 	CMD_RENAME,
 	CMD_DELETE,
 	CMD_FOLDER,
-	GQVIEW_EDITOR_SLOTS
+	GQ_EDITOR_SLOTS
 } SpecialEditor;
 
 typedef enum {
diff -r c2cb12def9d6 -r e213fb025621 src/utilops.c
--- a/src/utilops.c	Tue Apr 08 23:07:09 2008 +0000
+++ b/src/utilops.c	Tue Apr 08 23:16:12 2008 +0000
@@ -3289,7 +3289,7 @@
 		if (!fd->name ||
 		    (strcmp(fd->name, THUMB_FOLDER_GLOBAL) != 0 &&
 		     strcmp(fd->name, THUMB_FOLDER_LOCAL) != 0 &&
-		     strcmp(fd->name, GQVIEW_CACHE_LOCAL_METADATA) != 0) )
+		     strcmp(fd->name, GQ_CACHE_LOCAL_METADATA) != 0) )
 			{
 			rlist = g_list_prepend(rlist, fd);
 			}