Mercurial > geeqie

diff src/utilops.c @ 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 73efc1ba150f
children 9995c5fb202a
line wrap: on
line diff
--- 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);