# HG changeset patch
# User zas_
# Date 1227456629 0
# Node ID 0bea79d87065dae870c6646eb4190c1fd8630a9a
# Parent  52ce0263cb7cbb3947eb62c3b65799b908d2427a
Drop useless wmclass stuff. Gtk will take care of it and as said in the documentation using gtk_window_set_wmclass() is sort of pointless.

diff -r 52ce0263cb7c -r 0bea79d87065 src/bar_info.c
--- a/src/bar_info.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/bar_info.c	Sun Nov 23 16:10:29 2008 +0000
@@ -818,7 +818,7 @@
 	keyword_dialog = g_new0(KeywordDlg, 1);
 
 	keyword_dialog->gd = generic_dialog_new(_("Keyword Presets"),
-						GQ_WMCLASS, "keyword_presets", NULL, TRUE,
+						"keyword_presets", NULL, TRUE,
 						keyword_dialog_cancel_cb, keyword_dialog);
 	generic_dialog_add_message(keyword_dialog->gd, NULL, _("Favorite keywords list"), NULL);
 
diff -r 52ce0263cb7c -r 0bea79d87065 src/bar_sort.c
--- a/src/bar_sort.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/bar_sort.c	Sun Nov 23 16:10:29 2008 +0000
@@ -494,7 +494,7 @@
 		}
 
 	sd->dialog = file_util_file_dlg(title,
-				       GQ_WMCLASS, "add_bookmark", button,
+				       "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);
 
diff -r 52ce0263cb7c -r 0bea79d87065 src/cache_maint.c
--- a/src/cache_maint.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/cache_maint.c	Sun Nov 23 16:10:29 2008 +0000
@@ -316,7 +316,7 @@
 		}
 
 	cm->gd = generic_dialog_new(_("Maintenance"),
-				    GQ_WMCLASS, "main_maintenance",
+				    "main_maintenance",
 				    parent, FALSE,
 				    NULL, cm);
 	cm->gd->cancel_cb = cache_maintain_home_close_cb;
@@ -861,7 +861,7 @@
 	cd = g_new0(CleanData, 1);
 
 	cd->gd = generic_dialog_new(_("Create thumbnails"),
-				    GQ_WMCLASS, "create_thumbnails",
+				    "create_thumbnails",
 				    widget, FALSE,
 				    NULL, cd);
 	gtk_window_set_default_size(GTK_WINDOW(cd->gd->dialog), PURGE_DIALOG_WIDTH, -1);
@@ -1095,7 +1095,7 @@
 		}
 
 	cd->gd = generic_dialog_new(_("Maintenance"),
-				    GQ_WMCLASS, "standard_maintenance",
+				    "standard_maintenance",
 				    widget, FALSE,
 				    NULL, cd);
 	cd->gd->cancel_cb = cache_manager_standard_clean_close_cb;
@@ -1153,7 +1153,7 @@
 	GenericDialog *gd;
 
 	gd = generic_dialog_new(_("Clear cache"),
-				GQ_WMCLASS, "clear_cache", parent, TRUE,
+				"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?"));
@@ -1224,7 +1224,7 @@
 	cache_manager = g_new0(CacheManager, 1);
 
 	cache_manager->dialog = generic_dialog_new(_("Cache Maintenance"),
-						   GQ_WMCLASS, "cache_manager",
+						   "cache_manager",
 						   NULL, FALSE,
 						   NULL, cache_manager);
 	gd = cache_manager->dialog;
diff -r 52ce0263cb7c -r 0bea79d87065 src/collect-dlg.c
--- a/src/collect-dlg.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/collect-dlg.c	Sun Nov 23 16:10:29 2008 +0000
@@ -66,7 +66,7 @@
 		{
 		GenericDialog *gd;
 
-		gd = file_util_gen_dlg(_("Overwrite File"), GQ_WMCLASS, "dlg_confirm",
+		gd = file_util_gen_dlg(_("Overwrite File"), "dlg_confirm",
 					GENERIC_DIALOG(fd)->dialog, TRUE,
 					collection_confirm_cancel_cb, fd);
 
@@ -193,7 +193,7 @@
 	cw = collection_window_find(cd);
 	if (cw) parent = cw->window;
 
-	fd = file_util_file_dlg(title, GQ_WMCLASS, "dlg_collection", parent,
+	fd = file_util_file_dlg(title, "dlg_collection", parent,
 			     collection_save_or_load_dialog_close_cb, cd);
 
 	generic_dialog_add_message(GENERIC_DIALOG(fd), NULL, title, NULL);
diff -r 52ce0263cb7c -r 0bea79d87065 src/collect.c
--- a/src/collect.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/collect.c	Sun Nov 23 16:10:29 2008 +0000
@@ -1106,7 +1106,7 @@
 		}
 
 	gd = generic_dialog_new(_("Close collection"),
-				GQ_WMCLASS, "close_collection", cw->window, FALSE,
+				"close_collection", cw->window, FALSE,
 				collection_close_cancel_cb, cw);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
 				   _("Close collection"),
diff -r 52ce0263cb7c -r 0bea79d87065 src/dupe.c
--- a/src/dupe.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/dupe.c	Sun Nov 23 16:10:29 2008 +0000
@@ -1907,7 +1907,7 @@
 
 	if (!di) return;
 
-	gd = file_util_gen_dlg("Image thumbprint debug info", GQ_WMCLASS, "thumbprint",
+	gd = file_util_gen_dlg("Image thumbprint debug info", "thumbprint",
 			       dw->window, TRUE,
 			       NULL, NULL);
 	generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
diff -r 52ce0263cb7c -r 0bea79d87065 src/editors.c
--- a/src/editors.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/editors.c	Sun Nov 23 16:10:29 2008 +0000
@@ -171,7 +171,7 @@
 
 	vd = g_new0(EditorVerboseData, 1);
 
-	vd->gd = file_util_gen_dlg(_("Edit command results"), GQ_WMCLASS, "editor_results",
+	vd->gd = file_util_gen_dlg(_("Edit command results"), "editor_results",
 				   NULL, FALSE,
 				   NULL, ed);
 	buf = g_strdup_printf(_("Output of %s"), text);
diff -r 52ce0263cb7c -r 0bea79d87065 src/layout.c
--- a/src/layout.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/layout.c	Sun Nov 23 16:10:29 2008 +0000
@@ -1946,7 +1946,7 @@
 
 	/* window */
 
-	lw->window = window_new(GTK_WINDOW_TOPLEVEL, GQ_WMCLASS, NULL, NULL, NULL);
+	lw->window = window_new(GTK_WINDOW_TOPLEVEL, GQ_APPNAME_LC, NULL, NULL, NULL);
 	gtk_window_set_resizable(GTK_WINDOW(lw->window), TRUE);
 	gtk_container_set_border_width(GTK_CONTAINER(lw->window), 0);
 
diff -r 52ce0263cb7c -r 0bea79d87065 src/main.c
--- a/src/main.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/main.c	Sun Nov 23 16:10:29 2008 +0000
@@ -630,7 +630,7 @@
 
 	msg = g_strdup_printf("%s - %s", GQ_APPNAME, _("exit"));
 	exit_dialog = generic_dialog_new(msg,
-				GQ_WMCLASS, "exit", parent, FALSE,
+				"exit", parent, FALSE,
 				exit_confirm_cancel_cb, NULL);
 	g_free(msg);
 	msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME);
diff -r 52ce0263cb7c -r 0bea79d87065 src/main.h
--- a/src/main.h	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/main.h	Sun Nov 23 16:10:29 2008 +0000
@@ -71,8 +71,6 @@
 #define GQ_WEBSITE "geeqie.sourceforge.net"
 #define GQ_EMAIL_ADDRESS "geeqie-devel@lists.sourceforge.net"
 
-#define GQ_WMCLASS GQ_APPNAME_LC
-
 #define GQ_RC_DIR		"." GQ_APPNAME_LC
 #define GQ_COLLECTIONS_DIR	"collections"
 #define GQ_TRASH_DIR		"trash"
diff -r 52ce0263cb7c -r 0bea79d87065 src/pan-view.c
--- a/src/pan-view.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/pan-view.c	Sun Nov 23 16:10:29 2008 +0000
@@ -2596,7 +2596,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"), GQ_WMCLASS, "pan_view_warning", NULL, FALSE,
+	gd = generic_dialog_new(_("Pan View Performance"), "pan_view_warning", NULL, FALSE,
 				NULL, NULL);
 	gd->data = file_data_ref(dir_fd);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
diff -r 52ce0263cb7c -r 0bea79d87065 src/preferences.c
--- a/src/preferences.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/preferences.c	Sun Nov 23 16:10:29 2008 +0000
@@ -757,7 +757,7 @@
 	GenericDialog *gd;
 
 	gd = generic_dialog_new(_("Reset filters"),
-				GQ_WMCLASS, "reset_filter", widget, TRUE,
+				"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?"));
@@ -795,7 +795,7 @@
 	GenericDialog *gd;
 
 	gd = generic_dialog_new(_("Reset editors"),
-				GQ_WMCLASS, "reset_filter", widget, TRUE,
+				"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?"));
@@ -823,7 +823,7 @@
 	GenericDialog *gd;
 	GtkWidget *entry;
 	gd = generic_dialog_new(_("Clear trash"),
-				GQ_WMCLASS, "clear_trash", widget, TRUE,
+				"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."));
@@ -871,7 +871,7 @@
 	GenericDialog *gd;
 
 	gd = generic_dialog_new(_("Reset image overlay template string"),
-				GQ_WMCLASS, "reset_image_overlay_template_string", widget, TRUE,
+				"reset_image_overlay_template_string", widget, TRUE,
 				dummy_cancel_cb, data);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Reset image overlay template string"),
 				   _("This will reset the image overlay template string to the default.\nContinue?"));
diff -r 52ce0263cb7c -r 0bea79d87065 src/print.c
--- a/src/print.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/print.c	Sun Nov 23 16:10:29 2008 +0000
@@ -2001,7 +2001,7 @@
 
 	if (GTK_WIDGET_VISIBLE(pw->dialog->dialog)) parent = pw->dialog->dialog;
 
-	gd = generic_dialog_new(_("Printing error"), GQ_WMCLASS, "print_warning",
+	gd = generic_dialog_new(_("Printing error"), "print_warning",
 				parent, TRUE, NULL, NULL);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
 
@@ -2615,7 +2615,7 @@
 
 	gtk_widget_hide(pw->dialog->dialog);
 
-	pw->job_dialog = file_util_gen_dlg(_("Print"), GQ_WMCLASS, "print_job_dialog",
+	pw->job_dialog = file_util_gen_dlg(_("Print"), "print_job_dialog",
 					   (GtkWidget *)gtk_window_get_transient_for(GTK_WINDOW(pw->dialog->dialog)), FALSE,
 					   print_job_cancel_cb, pw);
 
@@ -3371,7 +3371,7 @@
 
 	pw->save_settings = print_pref_int(PRINT_PREF_SAVE, TRUE);
 
-	pw->dialog = file_util_gen_dlg(_("Print"), GQ_WMCLASS, "print_dialog",
+	pw->dialog = file_util_gen_dlg(_("Print"), "print_dialog",
 				       parent, FALSE,
 				       print_window_cancel_cb, pw);
 
diff -r 52ce0263cb7c -r 0bea79d87065 src/ui_bookmark.c
--- a/src/ui_bookmark.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/ui_bookmark.c	Sun Nov 23 16:10:29 2008 +0000
@@ -273,7 +273,7 @@
 	p->bb = bookmark_from_string(text);
 	p->bb->parent = g_strdup(key);
 
-	gd = generic_dialog_new(_("Edit Bookmark"), GQ_WMCLASS, "bookmark_edit",
+	gd = generic_dialog_new(_("Edit Bookmark"), "bookmark_edit",
 				parent, TRUE,
 				bookmark_edit_cancel_cb, p);
 	g_signal_connect(G_OBJECT(gd->dialog), "destroy",
diff -r 52ce0263cb7c -r 0bea79d87065 src/ui_fileops.c
--- a/src/ui_fileops.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/ui_fileops.c	Sun Nov 23 16:10:29 2008 +0000
@@ -116,7 +116,7 @@
 		}
 
 	gd = generic_dialog_new(_("Filename encoding locale mismatch"),
-				GQ_WMCLASS, "locale warning", NULL, TRUE, NULL, NULL);
+				"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,
diff -r 52ce0263cb7c -r 0bea79d87065 src/ui_help.c
--- a/src/ui_help.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/ui_help.c	Sun Nov 23 16:10:29 2008 +0000
@@ -188,7 +188,7 @@
 }
 
 GtkWidget *help_window_new(const gchar *title,
-			   const gchar *wmclass, const gchar *subclass,
+			   const gchar *subclass,
 			   const gchar *path, const gchar *key)
 {
 	GtkWidget *window;
diff -r 52ce0263cb7c -r 0bea79d87065 src/ui_help.h
--- a/src/ui_help.h	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/ui_help.h	Sun Nov 23 16:10:29 2008 +0000
@@ -16,7 +16,7 @@
 
 
 GtkWidget *help_window_new(const gchar *title,
-			   const gchar *wmclass, const gchar *subclass,
+			   const gchar *subclass,
 			   const gchar *path, const gchar *key);
 void help_window_set_file(GtkWidget *window, const gchar *path, const gchar *key);
 void help_window_set_key(GtkWidget *window, const gchar *key);
diff -r 52ce0263cb7c -r 0bea79d87065 src/ui_pathsel.c
--- a/src/ui_pathsel.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/ui_pathsel.c	Sun Nov 23 16:10:29 2008 +0000
@@ -534,7 +534,7 @@
 		generic_dialog_close(gd);
 		}
 
-	dd->gd = generic_dialog_new(_("Delete file"), GQ_WMCLASS, "dlg_confirm",
+	dd->gd = generic_dialog_new(_("Delete file"), "dlg_confirm",
 				    dd->entry, TRUE,
 				    dest_view_delete_dlg_cancel, dl);
 
diff -r 52ce0263cb7c -r 0bea79d87065 src/ui_tabcomp.c
--- a/src/ui_tabcomp.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/ui_tabcomp.c	Sun Nov 23 16:10:29 2008 +0000
@@ -882,7 +882,7 @@
 		}
 
 	title = (td->fd_title) ? td->fd_title : _("Select path");
-	td->fd = file_dialog_new(title, GQ_WMCLASS, "select_path", td->entry,
+	td->fd = file_dialog_new(title, "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);
diff -r 52ce0263cb7c -r 0bea79d87065 src/ui_utildlg.c
--- a/src/ui_utildlg.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/ui_utildlg.c	Sun Nov 23 16:10:29 2008 +0000
@@ -208,7 +208,7 @@
 
 static void generic_dialog_setup(GenericDialog *gd,
 				 const gchar *title,
-				 const gchar *wmclass, const gchar *wmsubclass,
+				 const gchar *wmsubclass,
 				 GtkWidget *parent, gint auto_close,
 				 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
 {
@@ -281,14 +281,14 @@
 }
 
 GenericDialog *generic_dialog_new(const gchar *title,
-				  const gchar *wmclass, const gchar *wmsubclass,
+				  const gchar *wmsubclass,
 				  GtkWidget *parent, gint auto_close,
 				  void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
 {
 	GenericDialog *gd;
 
 	gd = g_new0(GenericDialog, 1);
-	generic_dialog_setup(gd, title, wmclass, wmsubclass,
+	generic_dialog_setup(gd, title, wmsubclass,
 			     parent, auto_close, cancel_cb, data);
 	return gd;
 }
@@ -308,7 +308,7 @@
 {
 	GenericDialog *gd;
 
-	gd = generic_dialog_new(heading, GQ_WMCLASS, "warning", parent, TRUE, NULL, NULL);
+	gd = generic_dialog_new(heading, "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);
@@ -334,7 +334,7 @@
 }
 
 FileDialog *file_dialog_new(const gchar *title,
-			    const gchar *wmclass, const gchar *wmsubclass,
+			    const gchar *wmsubclass,
 			    GtkWidget *parent,
 			    void (*cancel_cb)(FileDialog *, gpointer), gpointer data)
 {
@@ -343,7 +343,7 @@
 	fdlg = g_new0(FileDialog, 1);
 
 	generic_dialog_setup(GENERIC_DIALOG(fdlg), title,
-			     wmclass, wmsubclass, parent, FALSE,
+			     wmsubclass, parent, FALSE,
 			     (gpointer)cancel_cb, data);
 
 	return fdlg;
diff -r 52ce0263cb7c -r 0bea79d87065 src/ui_utildlg.h
--- a/src/ui_utildlg.h	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/ui_utildlg.h	Sun Nov 23 16:10:29 2008 +0000
@@ -53,7 +53,7 @@
 
 /* When parent is not NULL, the dialog is set as a transient of the window containing parent */
 GenericDialog *generic_dialog_new(const gchar *title,
-				  const gchar *wmclass, const gchar *wmsubclass,
+				  const gchar *wmsubclass,
 				  GtkWidget *parent, gint auto_close,
 				  void (*cancel_cb)(GenericDialog *, gpointer), gpointer data);
 void generic_dialog_close(GenericDialog *gd);
@@ -71,7 +71,7 @@
 			      const gchar *icon_stock_id, GtkWidget *parent);
 
 FileDialog *file_dialog_new(const gchar *title,
-			    const gchar *wmclass, const gchar *wmsubclass,
+			    const gchar *wmsubclass,
 			    GtkWidget *parent,
 			    void (*cancel_cb)(FileDialog *, gpointer), gpointer data);
 void file_dialog_close(FileDialog *fd);
diff -r 52ce0263cb7c -r 0bea79d87065 src/utilops.c
--- a/src/utilops.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/utilops.c	Sun Nov 23 16:10:29 2008 +0000
@@ -152,13 +152,13 @@
  */
 
 GenericDialog *file_util_gen_dlg(const gchar *title,
-				 const gchar *wmclass, const gchar *wmsubclass,
+				 const gchar *wmsubclass,
 				 GtkWidget *parent, gint auto_close,
 				 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
 {
 	GenericDialog *gd;
 
-	gd = generic_dialog_new(title, wmclass, wmsubclass, parent, auto_close, cancel_cb, data);
+	gd = generic_dialog_new(title, wmsubclass, parent, auto_close, cancel_cb, data);
 	if (options->place_dialogs_under_mouse)
 		{
 		gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
@@ -168,13 +168,13 @@
 }
 
 FileDialog *file_util_file_dlg(const gchar *title,
-			       const gchar *wmclass, const gchar *wmsubclass,
+			       const gchar *wmsubclass,
 			       GtkWidget *parent,
 			       void (*cancel_cb)(FileDialog *, gpointer), gpointer data)
 {
 	FileDialog *fdlg;
 
-	fdlg = file_dialog_new(title, wmclass, wmsubclass, parent, cancel_cb, data);
+	fdlg = file_dialog_new(title, wmsubclass, parent, cancel_cb, data);
 	if (options->place_dialogs_under_mouse)
 		{
 		gtk_window_set_position(GTK_WINDOW(GENERIC_DIALOG(fdlg)->dialog), GTK_WIN_POS_MOUSE);
@@ -197,7 +197,7 @@
 {
 	GenericDialog *gd;
 
-	gd = file_util_gen_dlg(heading, GQ_WMCLASS, "warning", parent, TRUE, NULL, NULL);
+	gd = file_util_gen_dlg(heading, "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 (options->place_dialogs_under_mouse)
@@ -511,7 +511,7 @@
 		if (resume_data)
 			{
 			g_string_append(msg, _("\n Continue multiple file operation?"));
-			d = file_util_gen_dlg(ud->messages.fail, GQ_WMCLASS, "dlg_confirm",
+			d = file_util_gen_dlg(ud->messages.fail, "dlg_confirm",
 					      NULL, TRUE,
 					      file_util_abort_cb, ud);
 
@@ -900,7 +900,7 @@
 		/* just a warning */
 		GenericDialog *d;
 
-		d = file_util_gen_dlg(ud->messages.title, GQ_WMCLASS, "dlg_confirm",
+		d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
 					ud->parent, TRUE,
 					file_util_check_abort_cb, ud);
 
@@ -915,7 +915,7 @@
 		/* fatal error */
 		GenericDialog *d;
 
-		d = file_util_gen_dlg(ud->messages.title, GQ_WMCLASS, "dlg_confirm",
+		d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
 					ud->parent, TRUE,
 					file_util_check_abort_cb, ud);
 		generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc);
@@ -1241,7 +1241,7 @@
 	GtkTreeSelection *selection;
 	gchar *dir_msg;
 
-	ud->gd = file_util_gen_dlg(ud->messages.title, GQ_WMCLASS, "dlg_confirm",
+	ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
 				   ud->parent, FALSE,  file_util_cancel_cb, ud);
 	generic_dialog_add_button(ud->gd, GTK_STOCK_DELETE, NULL, file_util_ok_cb, TRUE);
 
@@ -1294,7 +1294,7 @@
 		stock_id = GTK_STOCK_OK;
 		}
 
-	fdlg = file_util_file_dlg(ud->messages.title, GQ_WMCLASS, "dlg_dest_folder", ud->parent,
+	fdlg = file_util_file_dlg(ud->messages.title, "dlg_dest_folder", ud->parent,
 				  file_util_fdlg_cancel_cb, ud);
 	
 	ud->fdlg = fdlg;
@@ -1344,7 +1344,7 @@
 	GtkWidget *combo;
 	GtkWidget *page;
 
-	ud->gd = file_util_gen_dlg(ud->messages.title, GQ_WMCLASS, "dlg_confirm",
+	ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
 				   ud->parent, FALSE,  file_util_cancel_cb, ud);
 
 	box = generic_dialog_add_message(ud->gd, NULL, ud->messages.question, NULL);
@@ -1937,7 +1937,7 @@
 		GtkWidget *box;
 		gchar *text;
 
-		gd = file_util_gen_dlg(_("Folder contains subfolders"), GQ_WMCLASS, "dlg_warning",
+		gd = file_util_gen_dlg(_("Folder contains subfolders"), "dlg_warning",
 					parent, TRUE, NULL, NULL);
 		generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
 
diff -r 52ce0263cb7c -r 0bea79d87065 src/utilops.h
--- a/src/utilops.h	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/utilops.h	Sun Nov 23 16:10:29 2008 +0000
@@ -24,11 +24,11 @@
 void file_maint_copied(FileData *fd);
 
 GenericDialog *file_util_gen_dlg(const gchar *title,
-				 const gchar *wmclass, const gchar *wmsubclass,
+				 const gchar *wmsubclass,
 				 GtkWidget *parent, gint auto_close,
 				 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data);
 FileDialog *file_util_file_dlg(const gchar *title,
-			       const gchar *wmclass, const gchar *wmsubclass,
+			       const gchar *wmsubclass,
 			       GtkWidget *parent,
 			       void (*cancel_cb)(FileDialog *, gpointer), gpointer data);
 GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *message,
diff -r 52ce0263cb7c -r 0bea79d87065 src/window.c
--- a/src/window.c	Sat Nov 22 22:54:51 2008 +0000
+++ b/src/window.c	Sun Nov 23 16:10:29 2008 +0000
@@ -40,7 +40,6 @@
 
 	window_set_icon(window, icon, icon_file);
 	gtk_window_set_role(GTK_WINDOW(window), name);
-	gtk_window_set_wmclass(GTK_WINDOW(window), name, GQ_WMCLASS);
 
 	return window;
 }
@@ -249,7 +248,7 @@
 		}
 
 	path = g_build_filename(options->documentation.helpdir, "README", NULL);
-	help_window = help_window_new(_("Help"), GQ_WMCLASS, "help", path, key);
+	help_window = help_window_new(_("Help"), "help", path, key);
 	g_free(path);
 
 	g_signal_connect(G_OBJECT(help_window), "destroy",