Rename wmsubclass and name to role, which corresponds better to the purpose of the...

diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index cd7394b..7cc9407 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 *wmsubclass,
+                                const gchar *role,
                                 GtkWidget *parent, gint auto_close,
                                 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
 {
@@ -218,7 +218,7 @@ static void generic_dialog_setup(GenericDialog *gd,
        gd->data = data;
        gd->cancel_cb = cancel_cb;
 
-       gd->dialog = window_new(GTK_WINDOW_TOPLEVEL, wmsubclass, NULL, NULL, title);
+       gd->dialog = window_new(GTK_WINDOW_TOPLEVEL, role, NULL, NULL, title);
        gtk_window_set_type_hint(GTK_WINDOW(gd->dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 
        if (parent)
@@ -281,14 +281,14 @@ static void generic_dialog_setup(GenericDialog *gd,
 }
 
 GenericDialog *generic_dialog_new(const gchar *title,
-                                 const gchar *wmsubclass,
+                                 const gchar *role,
                                  GtkWidget *parent, gint auto_close,
                                  void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
 {
        GenericDialog *gd;
 
        gd = g_new0(GenericDialog, 1);
-       generic_dialog_setup(gd, title, wmsubclass,
+       generic_dialog_setup(gd, title, role,
                             parent, auto_close, cancel_cb, data);
        return gd;
 }
@@ -334,7 +334,7 @@ void file_dialog_close(FileDialog *fdlg)
 }
 
 FileDialog *file_dialog_new(const gchar *title,
-                           const gchar *wmsubclass,
+                           const gchar *role,
                            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,
-                            wmsubclass, parent, FALSE,
+                            role, parent, FALSE,
                             (gpointer)cancel_cb, data);
 
        return fdlg;

diff --git a/src/ui_utildlg.h b/src/ui_utildlg.h
index 7b785d1..d61b9a4 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 *wmsubclass,
+                                 const gchar *role,
                                  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 *wmsubclass,
+                           const gchar *role,
                            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 be606ed..d784cbe 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 *wmsubclass,
+                                const gchar *role,
                                 GtkWidget *parent, gint auto_close,
                                 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
 {
        GenericDialog *gd;
 
-       gd = generic_dialog_new(title, wmsubclass, parent, auto_close, cancel_cb, data);
+       gd = generic_dialog_new(title, role, 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 *wmsubclass,
+                              const gchar *role,
                               GtkWidget *parent,
                               void (*cancel_cb)(FileDialog *, gpointer), gpointer data)
 {
        FileDialog *fdlg;
 
-       fdlg = file_dialog_new(title, wmsubclass, parent, cancel_cb, data);
+       fdlg = file_dialog_new(title, role, parent, cancel_cb, data);
        if (options->place_dialogs_under_mouse)
                {
                gtk_window_set_position(GTK_WINDOW(GENERIC_DIALOG(fdlg)->dialog), GTK_WIN_POS_MOUSE);

diff --git a/src/utilops.h b/src/utilops.h
index a94c7e0..52b32c4 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 *wmsubclass,
+                                const gchar *role,
                                 GtkWidget *parent, gint auto_close,
                                 void (*cancel_cb)(GenericDialog *, gpointer), gpointer data);
 FileDialog *file_util_file_dlg(const gchar *title,
-                              const gchar *wmsubclass,
+                              const gchar *role,
                               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 c6d336d..ec8b806 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -17,7 +17,7 @@
 #include "ui_fileops.h"
 #include "ui_help.h"
 
-GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
+GtkWidget *window_new(GtkWindowType type, const gchar *role, const gchar *icon,
                      const gchar *icon_file, const gchar *subtitle)
 {
        gchar *title;
@@ -39,7 +39,7 @@ GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
        g_free(title);
 
        window_set_icon(window, icon, icon_file);
-       gtk_window_set_role(GTK_WINDOW(window), name);
+       gtk_window_set_role(GTK_WINDOW(window), role);
 
        return window;
 }

diff --git a/src/window.h b/src/window.h
index 0a0095b..23bde15 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -13,7 +13,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
+GtkWidget *window_new(GtkWindowType type, const gchar *role, const gchar *icon,
                      const gchar *icon_file, const gchar *subtitle);
 void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file);
 gint window_maximized(GtkWidget *window);