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.

diff --git a/src/bar_info.c b/src/bar_info.c
index 6570302..27d1293 100644 (file)
--- a/src/bar_info.c
+++ b/src/bar_info.c
@@ -669,7 +669,7 @@ static void keyword_dialog_show(void)
        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);
 

diff --git a/src/bar_sort.c b/src/bar_sort.c
index 9b129f4..e5c073a 100644 (file)
--- a/src/bar_sort.c
+++ b/src/bar_sort.c
@@ -490,7 +490,7 @@ static void bar_sort_add_cb(GtkWidget *button, gpointer data)
                }
 
        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);
 

diff --git a/src/cache_maint.c b/src/cache_maint.c
index 38b5a85..86ded03 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -312,7 +312,7 @@ void cache_maintain_home(gint metadata, gint clear, GtkWidget *parent)
                }
 
        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 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
        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 @@ static void cache_manager_standard_process(GtkWidget *widget, gint clear)
                }
 
        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 @@ void cache_manager_main_clear_confirm(GtkWidget *parent)
        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 @@ void cache_manager_show(void)
        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;

diff --git a/src/collect-dlg.c b/src/collect-dlg.c
index 009e4db..673e01f 100644 (file)
--- a/src/collect-dlg.c
+++ b/src/collect-dlg.c
@@ -65,7 +65,7 @@ static gint collection_save_confirmed(FileDialog *fd, gint overwrite, Collection
                {
                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 @@ static void collection_save_or_load_dialog(const gchar *path,
        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);

diff --git a/src/collect.c b/src/collect.c
index 507c505..f1386d7 100644 (file)
--- a/src/collect.c
+++ b/src/collect.c
@@ -1089,7 +1089,7 @@ static void collection_close_dlg_show(CollectWindow *cw)
                }
 
        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 @@ CollectWindow *collection_window_new(const gchar *path)
 
        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",

diff --git a/src/dupe.c b/src/dupe.c
index 28b2907..307f811 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -1893,7 +1893,7 @@ static void dupe_display_stats(DupeWindow *dw, DupeItem *di)
        
        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 @@ DupeWindow *dupe_window_new(DupeMatchType match_mask)
 
        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",

diff --git a/src/editors.c b/src/editors.c
index 81cf210..2f9bbf6 100644 (file)
--- a/src/editors.c
+++ b/src/editors.c
@@ -156,7 +156,7 @@ static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *tex
 
        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);

diff --git a/src/fullscreen.c b/src/fullscreen.c
index 6f87ed1..223e4c3 100644 (file)
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -239,7 +239,7 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
                                      &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);

diff --git a/src/gqview.h b/src/gqview.h
index 8a2f953..ba3675a 100644 (file)
--- a/src/gqview.h
+++ b/src/gqview.h
@@ -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"

diff --git a/src/img-view.c b/src/img-view.c
index 091ce19..803bed9 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -852,7 +852,7 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
 
        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);

diff --git a/src/info.c b/src/info.c
index edb8aab..206477b 100644 (file)
--- a/src/info.c
+++ b/src/info.c
@@ -774,7 +774,7 @@ void info_window_new(FileData *fd, GList *list)
 
        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;

diff --git a/src/layout.c b/src/layout.c
index 51d8c2f..af064dd 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1351,7 +1351,7 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
 
                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 @@ LayoutWindow *layout_new_with_geometry(const gchar *path, gint popped, gint hidd
        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);

diff --git a/src/main.c b/src/main.c
index b84473b..e8f4d51 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -235,7 +235,7 @@ void help_window_show(const gchar *key)
                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 @@ static gint exit_confirm_dlg(void)
                }
 
        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?"));

diff --git a/src/pan-view.c b/src/pan-view.c
index b72602b..6b1316f 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -2362,7 +2362,7 @@ static void pan_window_new_real(const gchar *path)
 
        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 @@ static gint pan_warning(const gchar *path)
        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,

diff --git a/src/preferences.c b/src/preferences.c
index eb024f7..8d75a1e 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -745,7 +745,7 @@ static void filter_default_cb(GtkWidget *widget, gpointer data)
        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 @@ static void editor_default_cb(GtkWidget *widget, gpointer data)
        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 @@ static void safe_delete_clear_cb(GtkWidget* widget, gpointer data)
        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 @@ static void config_window_create(void)
        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 @@ void show_about_window(void)
 
        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);
 

diff --git a/src/print.c b/src/print.c
index 67dc38d..2d4e0da 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1998,7 +1998,7 @@ static void print_job_throw_error(PrintWindow *pw, const gchar *message)
 
        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 @@ static gint print_job_start(PrintWindow *pw, RenderFormat format, PrintOutput ou
 
        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 @@ void print_window_new(FileData *fd, GList *selection, GList *list, GtkWidget *pa
 
        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);
 

diff --git a/src/search.c b/src/search.c
index 11ac037..ddf3692 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -2557,7 +2557,7 @@ void search_new(const gchar *path, const gchar *example_file)
 
        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;

diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index 5996ad7..c3891e9 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -591,7 +591,7 @@ static void bookmark_edit(const gchar *key, const gchar *text, GtkWidget *parent
        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",

diff --git a/src/ui_fileops.c b/src/ui_fileops.c
index d9f6ebc..62a2322 100644 (file)
--- a/src/ui_fileops.c
+++ b/src/ui_fileops.c
@@ -111,7 +111,7 @@ static void encoding_dialog(const gchar *path)
                }
 
        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,

diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c
index d8c12a1..8b3dbc0 100644 (file)
--- a/src/ui_pathsel.c
+++ b/src/ui_pathsel.c
@@ -526,7 +526,7 @@ static void dest_view_delete(Dest_Data *dd, GtkTreeView *view)
                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);
 

diff --git a/src/ui_tabcomp.c b/src/ui_tabcomp.c
index 0f15589..0fb9724 100644 (file)
--- a/src/ui_tabcomp.c
+++ b/src/ui_tabcomp.c
@@ -856,7 +856,7 @@ static void tab_completion_select_show(TabCompData *td)
                }
 
        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);

diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index cc3e703..8dedca5 100644 (file)
--- a/src/ui_utildlg.c
+++ b/src/ui_utildlg.c
@@ -308,7 +308,7 @@ GenericDialog *warning_dialog(const gchar *heading, const gchar *text,
 {
        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);

diff --git a/src/utilops.c b/src/utilops.c
index d7aa40b..7954018 100644 (file)
--- a/src/utilops.c
+++ b/src/utilops.c
@@ -296,7 +296,7 @@ GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *messa
 {
        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 @@ static GenericDialog *file_util_move_multiple_confirm_dialog(FileDataMult *fdm)
        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 @@ static void file_util_move_multiple(FileDataMult *fdm)
                                        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 @@ static void file_util_move_multiple(FileDataMult *fdm)
                                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 @@ static void file_util_move_single(FileDataSingle *fds)
                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 @@ static void real_file_util_move(FileData *source_fd, GList *source_list,
                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 @@ static gint file_util_delete_ext_cb(gpointer resume_data, gint flags, GList *lis
                        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 @@ static void file_util_delete_multiple_ok_cb(GenericDialog *gd, gpointer data)
                                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 @@ static void file_util_delete_multiple(GList *source_list, GtkWidget *parent)
                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 @@ static void file_util_delete_single(FileData *fd, GtkWidget *parent)
                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 @@ static void file_util_rename_multiple(RenameDataMult *rd)
                {
                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 @@ static void file_util_rename_multiple_do(GList *source_list, GtkWidget *parent)
        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 @@ static void file_util_rename_single(FileDataSingle *fds)
                {
                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 @@ static void file_util_rename_single_do(FileData *source_fd, GtkWidget *parent)
        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 @@ void file_util_create_dir(const gchar *path, GtkWidget *parent)
 
        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 @@ void file_util_delete_dir(FileData *fd, GtkWidget *parent)
                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 @@ void file_util_delete_dir(FileData *fd, GtkWidget *parent)
                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 @@ void file_util_delete_dir(FileData *fd, GtkWidget *parent)
                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);