Mercurial > geeqie.yaz

changeset 254:9faf34f047b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the wmclass value unique among the code by defining it in main header file as GQ_WMCLASS. Before this patch, it was set using PACKAGE (="geeqie"), or by the hardcoded string "Geeqie". Now all Geeqie windows have the same value for wmclass.
author zas_
date Thu, 03 Apr 2008 23:29:14 +0000
parents b932b6928e20
children 40563fd744de
files src/bar_info.c src/bar_sort.c src/cache_maint.c src/collect-dlg.c src/collect.c src/dupe.c src/editors.c src/fullscreen.c src/gqview.h src/img-view.c src/info.c src/layout.c src/main.c src/pan-view.c src/preferences.c src/print.c src/search.c src/ui_bookmark.c src/ui_fileops.c src/ui_pathsel.c src/ui_tabcomp.c src/ui_utildlg.c src/utilops.c
diffstat 23 files changed, 57 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/src/bar_info.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/bar_info.c	Thu Apr 03 23:29:14 2008 +0000
@@ -669,7 +669,7 @@
 	keyword_dialog = g_new0(KeywordDlg, 1);
 
 	keyword_dialog->gd = generic_dialog_new(_("Keyword Presets"),
-						"Geeqie", "keyword_presets", NULL, TRUE,
+						GQ_WMCLASS, "keyword_presets", NULL, TRUE,
 						keyword_dialog_cancel_cb, keyword_dialog);
 	generic_dialog_add_message(keyword_dialog->gd, NULL, _("Favorite keywords list"), NULL);
 
--- a/src/bar_sort.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/bar_sort.c	Thu Apr 03 23:29:14 2008 +0000
@@ -490,7 +490,7 @@
 		}
 
 	sd->dialog = file_util_file_dlg(title,
-				       "Geeqie", "add_bookmark", button,
+				       GQ_WMCLASS, "add_bookmark", button,
 				       bar_sort_add_cancel_cb, sd);
 	file_dialog_add_button(sd->dialog, GTK_STOCK_OK, NULL, bar_sort_add_ok_cb, TRUE);
 
--- a/src/cache_maint.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/cache_maint.c	Thu Apr 03 23:29:14 2008 +0000
@@ -312,7 +312,7 @@
 		}
 
 	cm->gd = generic_dialog_new(_("Maintenance"),
-				    "Geeqie", "main_maintenance",
+				    GQ_WMCLASS, "main_maintenance",
 				    parent, FALSE,
 				    NULL, cm);
 	cm->gd->cancel_cb = cache_maintain_home_close_cb;
@@ -820,7 +820,7 @@
 	cd = g_new0(CleanData, 1);
 
 	cd->gd = generic_dialog_new(_("Create thumbnails"),
-				    "Geeqie", "create_thumbnails",
+				    GQ_WMCLASS, "create_thumbnails",
 				    widget, FALSE,
 				    NULL, cd);
 	gtk_window_set_default_size(GTK_WINDOW(cd->gd->dialog), PURGE_DIALOG_WIDTH, -1);
@@ -1050,7 +1050,7 @@
 		}
 
 	cd->gd = generic_dialog_new(_("Maintenance"),
-				    "Geeqie", "standard_maintenance",
+				    GQ_WMCLASS, "standard_maintenance",
 				    widget, FALSE,
 				    NULL, cd);
 	cd->gd->cancel_cb = cache_manager_standard_clean_close_cb;
@@ -1108,7 +1108,7 @@
 	GenericDialog *gd;
 
 	gd = generic_dialog_new(_("Clear cache"),
-				"Geeqie", "clear_cache", parent, TRUE,
+				GQ_WMCLASS, "clear_cache", parent, TRUE,
 				dummy_cancel_cb, NULL);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Clear cache"),
 				   _("This will remove all thumbnails that have\nbeen saved to disk, continue?"));
@@ -1162,7 +1162,7 @@
 	cache_manager = g_new0(CacheManager, 1);
 
 	cache_manager->dialog = generic_dialog_new(_("Cache Maintenance - Geeqie"),
-						   "Geeqie", "cache_manager",
+						   GQ_WMCLASS, "cache_manager",
 						   NULL, FALSE,
 						   NULL, cache_manager);
 	gd = cache_manager->dialog;
--- a/src/collect-dlg.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/collect-dlg.c	Thu Apr 03 23:29:14 2008 +0000
@@ -65,7 +65,7 @@
 		{
 		GenericDialog *gd;
 
-		gd = file_util_gen_dlg(_("Overwrite File"), "Geeqie", "dlg_confirm",
+		gd = file_util_gen_dlg(_("Overwrite File"), GQ_WMCLASS, "dlg_confirm",
 					GENERIC_DIALOG(fd)->dialog, TRUE,
 					collection_confirm_cancel_cb, fd);
 
@@ -192,7 +192,7 @@
 	cw = collection_window_find(cd);
 	if (cw) parent = cw->window;
 
-	fd = file_util_file_dlg(title, "Geeqie", "dlg_collection", parent,
+	fd = file_util_file_dlg(title, GQ_WMCLASS, "dlg_collection", parent,
 			     collection_save_or_load_dialog_close_cb, cd);
 
 	generic_dialog_add_message(GENERIC_DIALOG(fd), NULL, title, NULL);
--- a/src/collect.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/collect.c	Thu Apr 03 23:29:14 2008 +0000
@@ -1089,7 +1089,7 @@
 		}
 
 	gd = generic_dialog_new(_("Close collection"),
-				"Geeqie", "close_collection", cw->window, FALSE,
+				GQ_WMCLASS, "close_collection", cw->window, FALSE,
 				collection_close_cancel_cb, cw);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
 				   _("Close collection"),
@@ -1185,7 +1185,7 @@
 
 	gtk_window_set_resizable(GTK_WINDOW(cw->window), TRUE);
 	collection_window_update_title(cw);
-	gtk_window_set_wmclass(GTK_WINDOW(cw->window), "collection", "Geeqie");
+	gtk_window_set_wmclass(GTK_WINDOW(cw->window), "collection", GQ_WMCLASS);
 	gtk_container_set_border_width (GTK_CONTAINER (cw->window), 0);
 
 	g_signal_connect(G_OBJECT(cw->window), "delete_event",
--- a/src/dupe.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/dupe.c	Thu Apr 03 23:29:14 2008 +0000
@@ -1893,7 +1893,7 @@
 	
 	if (!di) return;
 
-	gd = file_util_gen_dlg("Image thumbprint debug info", "Geeqie", "thumbprint",
+	gd = file_util_gen_dlg("Image thumbprint debug info", GQ_WMCLASS, "thumbprint",
 			       dw->window, TRUE,
 			       NULL, NULL);
 	generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
@@ -3108,7 +3108,7 @@
 
 	gtk_window_set_resizable(GTK_WINDOW(dw->window), TRUE);
 	gtk_window_set_title(GTK_WINDOW(dw->window), _("Find duplicates - Geeqie"));
-        gtk_window_set_wmclass(GTK_WINDOW(dw->window), "dupe", "Geeqie");
+        gtk_window_set_wmclass(GTK_WINDOW(dw->window), "dupe", GQ_WMCLASS);
         gtk_container_set_border_width (GTK_CONTAINER (dw->window), 0);
 
         g_signal_connect(G_OBJECT(dw->window), "delete_event",
--- a/src/editors.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/editors.c	Thu Apr 03 23:29:14 2008 +0000
@@ -156,7 +156,7 @@
 
 	vd = g_new0(EditorVerboseData, 1);
 
-	vd->gd = file_util_gen_dlg(_("Edit command results"), "Geeqie", "editor_results",
+	vd->gd = file_util_gen_dlg(_("Edit command results"), GQ_WMCLASS, "editor_results",
 				   NULL, FALSE,
 				   NULL, ed);
 	buf = g_strdup_printf(_("Output of %s"), text);
--- a/src/fullscreen.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/fullscreen.c	Thu Apr 03 23:29:14 2008 +0000
@@ -239,7 +239,7 @@
 				      &screen, &same);
 
 	fs->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_wmclass(GTK_WINDOW(fs->window), "fullscreen", "Geeqie");
+	gtk_window_set_wmclass(GTK_WINDOW(fs->window), "fullscreen", GQ_WMCLASS);
 
 	/* this requests no decorations, if you still have them complain to the window manager author(s) */
 	gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE);
--- a/src/gqview.h	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/gqview.h	Thu Apr 03 23:29:14 2008 +0000
@@ -62,6 +62,8 @@
  *----------------------------------------------------------------------------
  */
 
+#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"
--- a/src/img-view.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/img-view.c	Thu Apr 03 23:29:14 2008 +0000
@@ -852,7 +852,7 @@
 
 	gtk_window_set_resizable(GTK_WINDOW(vw->window), TRUE);
 	gtk_window_set_title (GTK_WINDOW(vw->window), "Geeqie");
-        gtk_window_set_wmclass(GTK_WINDOW(vw->window), "view", "Geeqie");
+        gtk_window_set_wmclass(GTK_WINDOW(vw->window), "view", GQ_WMCLASS);
         gtk_container_set_border_width(GTK_CONTAINER(vw->window), 0);
 
 	window_set_icon(vw->window, PIXBUF_INLINE_ICON_VIEW, NULL);
--- a/src/info.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/info.c	Thu Apr 03 23:29:14 2008 +0000
@@ -774,7 +774,7 @@
 
 	gtk_window_set_resizable(GTK_WINDOW(id->window), TRUE);
 	gtk_window_set_title(GTK_WINDOW(id->window), _("Image properties - Geeqie"));
-	gtk_window_set_wmclass(GTK_WINDOW(id->window), "properties", "Geeqie");
+	gtk_window_set_wmclass(GTK_WINDOW(id->window), "properties", GQ_WMCLASS);
 
 	geometry.min_width = 32;
 	geometry.min_height = 32;
--- a/src/layout.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/layout.c	Thu Apr 03 23:29:14 2008 +0000
@@ -1351,7 +1351,7 @@
 
 	        gtk_window_set_resizable(GTK_WINDOW(lw->tools), TRUE);
         	gtk_window_set_title(GTK_WINDOW(lw->tools), _("Geeqie Tools"));
-        	gtk_window_set_wmclass(GTK_WINDOW(lw->tools), "tools", "Geeqie");
+        	gtk_window_set_wmclass(GTK_WINDOW(lw->tools), "tools", GQ_WMCLASS);
         	gtk_container_set_border_width(GTK_CONTAINER(lw->tools), 0);
 
 		window_set_icon(lw->tools, PIXBUF_INLINE_ICON_TOOLS, NULL);
@@ -1936,7 +1936,7 @@
 	gtk_window_set_resizable(GTK_WINDOW(lw->window), TRUE);
 
 	gtk_window_set_title(GTK_WINDOW(lw->window), "Geeqie");
-	gtk_window_set_wmclass(GTK_WINDOW(lw->window), "Geeqie", "Geeqie");
+	gtk_window_set_wmclass(GTK_WINDOW(lw->window), GQ_WMCLASS, GQ_WMCLASS);
 	gtk_container_set_border_width(GTK_CONTAINER(lw->window), 0);
 
 	window_set_icon(lw->window, NULL, NULL);
--- a/src/main.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/main.c	Thu Apr 03 23:29:14 2008 +0000
@@ -235,7 +235,7 @@
 		return;
 		}
 
-	help_window = help_window_new(_("Help - Geeqie"), "Geeqie", "help",
+	help_window = help_window_new(_("Help - Geeqie"), GQ_WMCLASS, "help",
                                       GQVIEW_HELPDIR "/README", key);
 	g_signal_connect(G_OBJECT(help_window), "destroy",
 			 G_CALLBACK(help_window_destroy_cb), NULL);
@@ -1233,7 +1233,7 @@
 		}
 
 	exit_dialog = generic_dialog_new(_("Geeqie - exit"),
-				"Geeqie", "exit", parent, FALSE,
+				GQ_WMCLASS, "exit", parent, FALSE,
 				exit_confirm_cancel_cb, NULL);
 	generic_dialog_add_message(exit_dialog, GTK_STOCK_DIALOG_QUESTION,
 				   _("Quit Geeqie"), _("Collections have been modified. Quit anyway?"));
--- a/src/pan-view.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/pan-view.c	Thu Apr 03 23:29:14 2008 +0000
@@ -2362,7 +2362,7 @@
 
 	gtk_window_set_resizable(GTK_WINDOW(pw->window), TRUE);
 	gtk_window_set_title (GTK_WINDOW(pw->window), _("Pan View - Geeqie"));
-        gtk_window_set_wmclass(GTK_WINDOW(pw->window), "view", "Geeqie");
+        gtk_window_set_wmclass(GTK_WINDOW(pw->window), "view", GQ_WMCLASS);
         gtk_container_set_border_width(GTK_CONTAINER(pw->window), 0);
 
 	window_set_icon(pw->window, NULL, NULL);
@@ -2576,7 +2576,7 @@
 	if (!pref_list_int_get(PAN_PREF_GROUP, PAN_PREF_HIDE_WARNING, &hide_dlg)) hide_dlg = FALSE;
 	if (hide_dlg) return FALSE;
 
-	gd = generic_dialog_new(_("Pan View Performance"), "Geeqie", "pan_view_warning", NULL, FALSE,
+	gd = generic_dialog_new(_("Pan View Performance"), GQ_WMCLASS, "pan_view_warning", NULL, FALSE,
 				NULL, NULL);
 	gd->data = g_strdup(path);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
--- a/src/preferences.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/preferences.c	Thu Apr 03 23:29:14 2008 +0000
@@ -745,7 +745,7 @@
 	GenericDialog *gd;
 
 	gd = generic_dialog_new(_("Reset filters"),
-				"Geeqie", "reset_filter", widget, TRUE,
+				GQ_WMCLASS, "reset_filter", widget, TRUE,
 				dummy_cancel_cb, NULL);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Reset filters"),
 				   _("This will reset the file filters to the defaults.\nContinue?"));
@@ -783,7 +783,7 @@
 	GenericDialog *gd;
 
 	gd = generic_dialog_new(_("Reset editors"),
-				"Geeqie", "reset_filter", widget, TRUE,
+				GQ_WMCLASS, "reset_filter", widget, TRUE,
 				dummy_cancel_cb, NULL);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Reset editors"),
 				   _("This will reset the edit commands to the defaults.\nContinue?"));
@@ -811,7 +811,7 @@
 	GenericDialog *gd;
 	GtkWidget *entry;
 	gd = generic_dialog_new(_("Clear trash"),
-				"Geeqie", "clear_trash", widget, TRUE,
+				GQ_WMCLASS, "clear_trash", widget, TRUE,
 				dummy_cancel_cb, NULL);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Clear trash"),
 				    _("This will remove the trash contents."));
@@ -1506,7 +1506,7 @@
 	gtk_window_set_default_size(GTK_WINDOW(configwindow), CONFIG_WINDOW_DEF_WIDTH, CONFIG_WINDOW_DEF_HEIGHT);		 
 	gtk_window_set_resizable(GTK_WINDOW(configwindow), TRUE);
 	gtk_window_set_title(GTK_WINDOW(configwindow), _("Geeqie Preferences"));
-	gtk_window_set_wmclass(GTK_WINDOW(configwindow), "config", "Geeqie");
+	gtk_window_set_wmclass(GTK_WINDOW(configwindow), "config", GQ_WMCLASS);
 	gtk_container_set_border_width(GTK_CONTAINER(configwindow), PREF_PAD_BORDER);
 
 	window_set_icon(configwindow, PIXBUF_INLINE_ICON_CONFIG, NULL);
@@ -1628,7 +1628,7 @@
 
 	about = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_type_hint(GTK_WINDOW(about), GDK_WINDOW_TYPE_HINT_DIALOG);
-	gtk_window_set_wmclass(GTK_WINDOW(about), "about", "Geeqie");
+	gtk_window_set_wmclass(GTK_WINDOW(about), "about", GQ_WMCLASS);
 	g_signal_connect(G_OBJECT(about), "delete_event",
 			 G_CALLBACK(about_delete_cb), NULL);
 
--- a/src/print.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/print.c	Thu Apr 03 23:29:14 2008 +0000
@@ -1998,7 +1998,7 @@
 
 	if (GTK_WIDGET_VISIBLE(pw->dialog->dialog)) parent = pw->dialog->dialog;
 
-	gd = generic_dialog_new(_("Printing error"), "Geeqie", "print_warning",
+	gd = generic_dialog_new(_("Printing error"), GQ_WMCLASS, "print_warning",
 				parent, TRUE, NULL, NULL);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
 
@@ -2599,7 +2599,7 @@
 
 	gtk_widget_hide(pw->dialog->dialog);
 
-	pw->job_dialog = file_util_gen_dlg(_("Print - Geeqie"), "Geeqie", "print_job_dialog",
+	pw->job_dialog = file_util_gen_dlg(_("Print - Geeqie"), GQ_WMCLASS, "print_job_dialog",
 					   (GtkWidget *)gtk_window_get_transient_for(GTK_WINDOW(pw->dialog->dialog)), FALSE,
 					   print_job_cancel_cb, pw);
 
@@ -3344,7 +3344,7 @@
 
 	pw->save_settings = print_pref_int(PRINT_PREF_SAVE, TRUE);
 
-	pw->dialog = file_util_gen_dlg(_("Print - Geeqie"), "Geeqie", "print_dialog",
+	pw->dialog = file_util_gen_dlg(_("Print - Geeqie"), GQ_WMCLASS, "print_dialog",
 				       parent, FALSE,
 				       print_window_cancel_cb, pw);
 
--- a/src/search.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/search.c	Thu Apr 03 23:29:14 2008 +0000
@@ -2557,7 +2557,7 @@
 
 	gtk_window_set_resizable(GTK_WINDOW(sd->window), TRUE);
 	gtk_window_set_title(GTK_WINDOW(sd->window), _("Image search - Geeqie"));
-	gtk_window_set_wmclass(GTK_WINDOW(sd->window), "search", "Geeqie");
+	gtk_window_set_wmclass(GTK_WINDOW(sd->window), "search", GQ_WMCLASS);
 
 	geometry.min_width = 32;
 	geometry.min_height = 32;
--- a/src/ui_bookmark.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/ui_bookmark.c	Thu Apr 03 23:29:14 2008 +0000
@@ -591,7 +591,7 @@
 	p->bb = bookmark_from_string(text);
 	p->bb->parent = g_strdup(key);
 
-	gd = generic_dialog_new(_("Edit Bookmark"), PACKAGE, "bookmark_edit",
+	gd = generic_dialog_new(_("Edit Bookmark"), GQ_WMCLASS, "bookmark_edit",
 				parent, TRUE,
 				bookmark_edit_cancel_cb, p);
 	g_signal_connect(G_OBJECT(gd->dialog), "destroy",
--- a/src/ui_fileops.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/ui_fileops.c	Thu Apr 03 23:29:14 2008 +0000
@@ -111,7 +111,7 @@
 		}
 
 	gd = generic_dialog_new("Filename encoding locale mismatch",
-				PACKAGE, "locale warning", NULL, TRUE, NULL, NULL);
+				GQ_WMCLASS, "locale warning", NULL, TRUE, NULL, NULL);
 	generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
 
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
--- a/src/ui_pathsel.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/ui_pathsel.c	Thu Apr 03 23:29:14 2008 +0000
@@ -526,7 +526,7 @@
 		generic_dialog_close(gd);
 		}
 
-	dd->gd = generic_dialog_new(_("Delete file"), PACKAGE, "dlg_confirm",
+	dd->gd = generic_dialog_new(_("Delete file"), GQ_WMCLASS, "dlg_confirm",
 				    dd->entry, TRUE,
 				    dest_view_delete_dlg_cancel, dl);
 
--- a/src/ui_tabcomp.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/ui_tabcomp.c	Thu Apr 03 23:29:14 2008 +0000
@@ -856,7 +856,7 @@
 		}
 
 	title = (td->fd_title) ? td->fd_title : _("Select path");
-	td->fd = file_dialog_new(title, PACKAGE, "select_path", td->entry,
+	td->fd = file_dialog_new(title, GQ_WMCLASS, "select_path", td->entry,
 				 tab_completion_select_cancel_cb, td);
 	file_dialog_add_button(td->fd, GTK_STOCK_OK, NULL,
 				 tab_completion_select_ok_cb, TRUE);
--- a/src/ui_utildlg.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/ui_utildlg.c	Thu Apr 03 23:29:14 2008 +0000
@@ -308,7 +308,7 @@
 {
 	GenericDialog *gd;
 
-	gd = generic_dialog_new(heading, PACKAGE, "warning", parent, TRUE, NULL, NULL);
+	gd = generic_dialog_new(heading, GQ_WMCLASS, "warning", parent, TRUE, NULL, NULL);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, warning_dialog_ok_cb, TRUE);
 
 	generic_dialog_add_message(gd, icon_stock_id, heading, text);
--- a/src/utilops.c	Thu Apr 03 22:39:50 2008 +0000
+++ b/src/utilops.c	Thu Apr 03 23:29:14 2008 +0000
@@ -296,7 +296,7 @@
 {
 	GenericDialog *gd;
 
-	gd = file_util_gen_dlg(heading, "Geeqie", "warning", parent, TRUE, NULL, NULL);
+	gd = file_util_gen_dlg(heading, GQ_WMCLASS, "warning", parent, TRUE, NULL, NULL);
 	generic_dialog_add_message(gd, icon_stock_id, heading, message);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, file_util_warning_dialog_ok_cb, TRUE);
 	if (place_dialogs_under_mouse)
@@ -644,7 +644,7 @@
 	GenericDialog *gd;
 	GtkWidget *hbox;
 
-	gd = file_util_gen_dlg(_("Overwrite file"), "Geeqie", "dlg_confirm",
+	gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
 				NULL, TRUE,
 				file_util_move_multiple_cancel_cb, fdm);
 
@@ -726,7 +726,7 @@
 					text = g_strdup_printf(_("Unable to move file:\n%s\nto itself."), fdm->dest);
 					}
 
-				gd = file_util_gen_dlg(title, "Geeqie", "dlg_confirm",
+				gd = file_util_gen_dlg(title, GQ_WMCLASS, "dlg_confirm",
 							NULL, TRUE,
 							file_util_move_multiple_cancel_cb, fdm);
 				generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, title, text);
@@ -812,7 +812,7 @@
 				title = _("Error moving file");
 				text = g_strdup_printf(_("Unable to move file:\n%s\nto:\n%s\nduring multiple file move."), fdm->source_fd->path, fdm->dest);
 				}
-			gd = file_util_gen_dlg(title, "Geeqie", "dlg_confirm",
+			gd = file_util_gen_dlg(title, GQ_WMCLASS, "dlg_confirm",
 						NULL, TRUE,
 						file_util_move_multiple_cancel_cb, fdm);
 			generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, title, text);
@@ -974,7 +974,7 @@
 		GenericDialog *gd;
 		GtkWidget *hbox;
 
-		gd = file_util_gen_dlg(_("Overwrite file"), "Geeqie", "dlg_confirm",
+		gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
 					NULL, TRUE,
 					file_util_move_single_cancel_cb, fds);
 
@@ -1197,7 +1197,7 @@
 		stock_id = GTK_STOCK_OK;
 		}
 
-	fdlg = file_util_file_dlg(title, "Geeqie", "dlg_copymove", parent,
+	fdlg = file_util_file_dlg(title, GQ_WMCLASS, "dlg_copymove", parent,
 				file_util_move_cancel_cb, NULL);
 	generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, text, NULL);
 
@@ -1522,7 +1522,7 @@
 			if (resume_data)
 				{
 				g_string_append(msg, _("\n Continue multiple delete operation?"));
-				d = file_util_gen_dlg(_("Delete failed"), "Geeqie", "dlg_confirm",
+				d = file_util_gen_dlg(_("Delete failed"), GQ_WMCLASS, "dlg_confirm",
 						      NULL, TRUE,
 						      file_util_delete_ext_cancel_cb, resume_data);
 
@@ -1614,7 +1614,7 @@
 				GenericDialog *d;
 				gchar *text;
 
-				d = file_util_gen_dlg(_("Delete failed"), "Geeqie", "dlg_confirm",
+				d = file_util_gen_dlg(_("Delete failed"), GQ_WMCLASS, "dlg_confirm",
 						      NULL, TRUE,
 						      file_util_delete_multiple_cancel_cb, source_list);
 
@@ -1759,7 +1759,7 @@
 		gchar *buf;
 
 		gd = file_util_gen_dlg(_("Delete files - Geeqie"),
-					"Geeqie", "dlg_confirm", parent, TRUE,
+					GQ_WMCLASS, "dlg_confirm", parent, TRUE,
 					file_util_delete_multiple_cancel_cb, source_list);
 
 		generic_dialog_add_message(gd, NULL, _("Delete multiple files"), NULL);
@@ -1854,7 +1854,7 @@
 		GtkWidget *table;
 		gchar *base;
 
-		gd = file_util_gen_dlg(_("Delete file - Geeqie"), "Geeqie", "dlg_confirm",
+		gd = file_util_gen_dlg(_("Delete file - Geeqie"), GQ_WMCLASS, "dlg_confirm",
 					parent, TRUE,
 					file_util_delete_cancel_cb, file_data_ref(fd));
 
@@ -2011,7 +2011,7 @@
 		{
 		GenericDialog *gd;
 
-		gd = file_util_gen_dlg(_("Overwrite file"), "Geeqie", "dlg_confirm",
+		gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
 					NULL, TRUE,
 					file_util_rename_multiple_cancel_cb, rd);
 
@@ -2541,7 +2541,7 @@
 	rd = g_new0(RenameDataMult, 1);
 
 	rd->fdlg = file_util_file_dlg(_("Rename - Geeqie"),
-				    "Geeqie", "dlg_rename", parent,
+				    GQ_WMCLASS, "dlg_rename", parent,
 				    file_util_rename_multiple_close_cb, rd);
 	generic_dialog_add_message(GENERIC_DIALOG(rd->fdlg), NULL, _("Rename multiple files"), NULL);
 	file_dialog_add_button(rd->fdlg, GTK_STOCK_OK, _("_Rename"), file_util_rename_multiple_cb, TRUE);
@@ -2729,7 +2729,7 @@
 		{
 		GenericDialog *gd;
 
-		gd = file_util_gen_dlg(_("Overwrite file"), "Geeqie", "dlg_confirm",
+		gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
 					NULL, TRUE,
 					file_util_rename_single_cancel_cb, fds);
 
@@ -2797,7 +2797,7 @@
 	GtkWidget *table;
 	const gchar *name;
 
-	fdlg = file_util_file_dlg(_("Rename - Geeqie"), "Geeqie", "dlg_rename", parent,
+	fdlg = file_util_file_dlg(_("Rename - Geeqie"), GQ_WMCLASS, "dlg_rename", parent,
 			     file_util_rename_single_close_cb, NULL);
 
 	generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, _("Rename file"), NULL);
@@ -2919,7 +2919,7 @@
 
 	if (!isdir(path)) return;
 
-	fdlg = file_util_file_dlg(_("New folder - Geeqie"), "Geeqie", "dlg_newdir", parent,
+	fdlg = file_util_file_dlg(_("New folder - Geeqie"), GQ_WMCLASS, "dlg_newdir", parent,
 			     file_util_create_dir_close_cb, NULL);
 
 	text = g_strdup_printf(_("Create folder in:\n%s\nnamed:"), path);
@@ -3317,7 +3317,7 @@
 		ud->dlist = NULL;
 		ud->flist = NULL;
 
-		ud->gd = file_util_gen_dlg(_("Delete folder"), "Geeqie", "dlg_confirm",
+		ud->gd = file_util_gen_dlg(_("Delete folder"), GQ_WMCLASS, "dlg_confirm",
 					   parent, TRUE,
 					   file_util_delete_dir_cancel_cb, ud);
 
@@ -3366,7 +3366,7 @@
 		GtkWidget *box;
 		gchar *text;
 
-		gd = file_util_gen_dlg(_("Folder contains subfolders"), "Geeqie", "dlg_warning",
+		gd = file_util_gen_dlg(_("Folder contains subfolders"), GQ_WMCLASS, "dlg_warning",
 					parent, TRUE, NULL, NULL);
 		generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
 
@@ -3401,7 +3401,7 @@
 		ud->flist = filelist_sort_path(flist);
 		flist = NULL;
 
-		ud->gd = file_util_gen_dlg(_("Delete folder"), "Geeqie", "dlg_confirm",
+		ud->gd = file_util_gen_dlg(_("Delete folder"), GQ_WMCLASS, "dlg_confirm",
 					   parent, TRUE, file_util_delete_dir_cancel_cb, ud);
 		generic_dialog_add_button(ud->gd, GTK_STOCK_DELETE, NULL, file_util_delete_dir_ok_cb, TRUE);