Drop useless wmclass stuff. Gtk will take care of it and as said in the documentation...

diff --git a/src/bar_info.c b/src/bar_info.c
index fff5815..5aee6f8 100644 (file)
--- a/src/bar_info.c
+++ b/src/bar_info.c
@@ -818,7 +818,7 @@ static void keyword_dialog_show(void)
        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 --git a/src/bar_sort.c b/src/bar_sort.c
index 0a4c40f..562ad29 100644 (file)
--- a/src/bar_sort.c
+++ b/src/bar_sort.c
@@ -494,7 +494,7 @@ static void bar_sort_add_cb(GtkWidget *button, gpointer data)
                }
 
        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 --git a/src/cache_maint.c b/src/cache_maint.c
index 1349598..1c930ab 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -316,7 +316,7 @@ void cache_maintain_home(gint metadata, gint clear, GtkWidget *parent)
                }
 
        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 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
        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 @@ static void cache_manager_standard_process(GtkWidget *widget, gint clear)
                }
 
        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 @@ void cache_manager_main_clear_confirm(GtkWidget *parent)
        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 @@ void cache_manager_show(void)
        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 --git a/src/collect-dlg.c b/src/collect-dlg.c
index 1839eba..ccd2697 100644 (file)
--- a/src/collect-dlg.c
+++ b/src/collect-dlg.c
@@ -66,7 +66,7 @@ static gint collection_save_confirmed(FileDialog *fd, gint overwrite, Collection
                {
                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 @@ 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, 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 --git a/src/collect.c b/src/collect.c
index 7597fed..f0d09f2 100644 (file)
--- a/src/collect.c
+++ b/src/collect.c
@@ -1106,7 +1106,7 @@ static void collection_close_dlg_show(CollectWindow *cw)
                }
 
        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 --git a/src/dupe.c b/src/dupe.c
index df0366c..84b36df 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -1907,7 +1907,7 @@ static void dupe_display_stats(DupeWindow *dw, DupeItem *di)
 
        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 --git a/src/editors.c b/src/editors.c
index c77e14b..d0f37ce 100644 (file)
--- a/src/editors.c
+++ b/src/editors.c
@@ -171,7 +171,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"), 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 --git a/src/layout.c b/src/layout.c
index d877622..9ac112e 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1946,7 +1946,7 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, gint popped, gint hidde
 
        /* 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 --git a/src/main.c b/src/main.c
index de76aba..4691618 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -630,7 +630,7 @@ static gint exit_confirm_dlg(void)
 
        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 --git a/src/main.h b/src/main.h
index 9454933..d1070ba 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -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 --git a/src/pan-view.c b/src/pan-view.c
index 8c6e176..b99a5f2 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -2596,7 +2596,7 @@ static gint pan_warning(FileData *dir_fd)
        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 --git a/src/preferences.c b/src/preferences.c
index c85339b..aca5053 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -757,7 +757,7 @@ static void filter_default_cb(GtkWidget *widget, gpointer data)
        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 @@ static void editor_default_cb(GtkWidget *widget, gpointer data)
        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 @@ static void safe_delete_clear_cb(GtkWidget *widget, gpointer data)
        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 @@ static void image_overlay_default_template_cb(GtkWidget *widget, gpointer data)
        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 --git a/src/print.c b/src/print.c
index d434820..e0b4663 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -2001,7 +2001,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"), 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 @@ 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"), 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 @@ 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"), GQ_WMCLASS, "print_dialog",
+       pw->dialog = file_util_gen_dlg(_("Print"), "print_dialog",
                                       parent, FALSE,
                                       print_window_cancel_cb, pw);
 

diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index fc1d7f1..a8a9cbc 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -273,7 +273,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"), 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 --git a/src/ui_fileops.c b/src/ui_fileops.c
index 8d8c0b2..de4514c 100644 (file)
--- a/src/ui_fileops.c
+++ b/src/ui_fileops.c
@@ -116,7 +116,7 @@ static void encoding_dialog(const gchar *path)
                }
 
        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 --git a/src/ui_help.c b/src/ui_help.c
index 1f74fe3..6e90fc2 100644 (file)
--- a/src/ui_help.c
+++ b/src/ui_help.c
@@ -188,7 +188,7 @@ void help_window_set_file(GtkWidget *window, const gchar *path, const gchar *key
 }
 
 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 --git a/src/ui_help.h b/src/ui_help.h
index 44ec357..09bb1dd 100644 (file)
--- a/src/ui_help.h
+++ b/src/ui_help.h
@@ -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 --git a/src/ui_pathsel.c b/src/ui_pathsel.c
index 168332c..20870bc 100644 (file)
--- a/src/ui_pathsel.c
+++ b/src/ui_pathsel.c
@@ -534,7 +534,7 @@ static void dest_view_delete(Dest_Data *dd, GtkTreeView *view)
                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 --git a/src/ui_tabcomp.c b/src/ui_tabcomp.c
index b402d52..52d0ad8 100644 (file)
--- a/src/ui_tabcomp.c
+++ b/src/ui_tabcomp.c
@@ -882,7 +882,7 @@ static void tab_completion_select_show(TabCompData *td)
                }
 
        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 --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index c46c676..cd7394b 100644 (file)
--- a/src/ui_utildlg.c
+++ b/src/ui_utildlg.c
@@ -208,7 +208,7 @@ GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock
 
 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 @@ static void generic_dialog_setup(GenericDialog *gd,
 }
 
 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 *warning_dialog(const gchar *heading, const gchar *text,
 {
        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 @@ void file_dialog_close(FileDialog *fdlg)
 }
 
 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 @@ FileDialog *file_dialog_new(const gchar *title,
        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 --git a/src/ui_utildlg.h b/src/ui_utildlg.h
index 7b3e61e..7b785d1 100644 (file)
--- a/src/ui_utildlg.h
+++ b/src/ui_utildlg.h
@@ -53,7 +53,7 @@ struct _FileDialog
 
 /* 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 @@ GenericDialog *warning_dialog(const gchar *heading, const gchar *text,
                              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 --git a/src/utilops.c b/src/utilops.c
index 4dc3696..be606ed 100644 (file)
--- a/src/utilops.c
+++ b/src/utilops.c
@@ -152,13 +152,13 @@ static void generic_dialog_image_set(GenericDialog *gd, 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)
 {
        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 @@ GenericDialog *file_util_gen_dlg(const gchar *title,
 }
 
 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 *file_util_warning_dialog(const gchar *heading, const gchar *messa
 {
        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 @@ static gint file_util_perform_ci_cb(gpointer resume_data, gint flags, GList *lis
                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 @@ void file_util_check_ci(UtilityData *ud)
                /* 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 @@ void file_util_check_ci(UtilityData *ud)
                /* 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 @@ static void file_util_dialog_init_simple_list(UtilityData *ud)
        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 @@ static void file_util_dialog_init_dest_folder(UtilityData *ud)
                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 @@ static void file_util_dialog_init_source_dest(UtilityData *ud)
        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 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh
                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 --git a/src/utilops.h b/src/utilops.h
index 7cf9f32..a94c7e0 100644 (file)
--- a/src/utilops.h
+++ b/src/utilops.h
@@ -24,11 +24,11 @@ void file_maint_moved(FileData *fd, GList *ignore_list);
 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 --git a/src/window.c b/src/window.c
index 4e14b32..c6d336d 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -40,7 +40,6 @@ GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
 
        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 @@ void help_window_show(const gchar *key)
                }
 
        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",