Mercurial > geeqie.yaz

changeset 1175:2518a4a73d89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename wmsubclass and name to role, which corresponds better to the purpose of the parameter as it ends to be passed to gtk_window_set_role().
author zas_
date Sun, 23 Nov 2008 16:16:09 +0000
parents 0bea79d87065
children d3e51e1a02f8
files src/ui_utildlg.c src/ui_utildlg.h src/utilops.c src/utilops.h src/window.c src/window.h
diffstat 6 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/ui_utildlg.c	Sun Nov 23 16:10:29 2008 +0000
+++ b/src/ui_utildlg.c	Sun Nov 23 16:16:09 2008 +0000
@@ -208,7 +208,7 @@
 
 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 @@
 	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 @@
 }
 
 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 @@
 }
 
 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 @@
 	fdlg = g_new0(FileDialog, 1);
 
 	generic_dialog_setup(GENERIC_DIALOG(fdlg), title,
-			     wmsubclass, parent, FALSE,
+			     role, parent, FALSE,
 			     (gpointer)cancel_cb, data);
 
 	return fdlg;
--- a/src/ui_utildlg.h	Sun Nov 23 16:10:29 2008 +0000
+++ b/src/ui_utildlg.h	Sun Nov 23 16:16:09 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 *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 @@
 			      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);
--- a/src/utilops.c	Sun Nov 23 16:10:29 2008 +0000
+++ b/src/utilops.c	Sun Nov 23 16:16:09 2008 +0000
@@ -152,13 +152,13 @@
  */
 
 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 @@
 }
 
 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);
--- a/src/utilops.h	Sun Nov 23 16:10:29 2008 +0000
+++ b/src/utilops.h	Sun Nov 23 16:16:09 2008 +0000
@@ -24,11 +24,11 @@
 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,
--- a/src/window.c	Sun Nov 23 16:10:29 2008 +0000
+++ b/src/window.c	Sun Nov 23 16:16:09 2008 +0000
@@ -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 @@
 	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;
 }
--- a/src/window.h	Sun Nov 23 16:10:29 2008 +0000
+++ b/src/window.h	Sun Nov 23 16:16:09 2008 +0000
@@ -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);