Revision: 1270
http://geeqie.svn.sourceforge.net/geeqie/?rev=1270&view=rev
Author: zas_
Date: 2008-11-23 16:16:09 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
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().
Modified Paths:
--------------
trunk/src/ui_utildlg.c
trunk/src/ui_utildlg.h
trunk/src/utilops.c
trunk/src/utilops.h
trunk/src/window.c
trunk/src/window.h
Modified: trunk/src/ui_utildlg.c
===================================================================
--- trunk/src/ui_utildlg.c 2008-11-23 16:10:29 UTC (rev 1269)
+++ trunk/src/ui_utildlg.c 2008-11-23 16:16:09 UTC (rev 1270)
@@ -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;
Modified: trunk/src/ui_utildlg.h
===================================================================
--- trunk/src/ui_utildlg.h 2008-11-23 16:10:29 UTC (rev 1269)
+++ trunk/src/ui_utildlg.h 2008-11-23 16:16:09 UTC (rev 1270)
@@ -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);
Modified: trunk/src/utilops.c
===================================================================
--- trunk/src/utilops.c 2008-11-23 16:10:29 UTC (rev 1269)
+++ trunk/src/utilops.c 2008-11-23 16:16:09 UTC (rev 1270)
@@ -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);
Modified: trunk/src/utilops.h
===================================================================
--- trunk/src/utilops.h 2008-11-23 16:10:29 UTC (rev 1269)
+++ trunk/src/utilops.h 2008-11-23 16:16:09 UTC (rev 1270)
@@ -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,
Modified: trunk/src/window.c
===================================================================
--- trunk/src/window.c 2008-11-23 16:10:29 UTC (rev 1269)
+++ trunk/src/window.c 2008-11-23 16:16:09 UTC (rev 1270)
@@ -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;
}
Modified: trunk/src/window.h
===================================================================
--- trunk/src/window.h 2008-11-23 16:10:29 UTC (rev 1269)
+++ trunk/src/window.h 2008-11-23 16:16:09 UTC (rev 1270)
@@ -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);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
