From 79a66d36d2188a2f8553ca80f364089df460932b Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 30 Jan 2012 22:59:09 +0100 Subject: [PATCH] app: rename GimpWindowStrategy::create_dockable_dialog() to ::show_dockable_dialog() because that's what it wlays does, no matter if the dialog has to be created or now. --- app/actions/dialogs-commands.c | 10 +++++----- app/display/gimpmultiwindowstrategy.c | 14 +++++++------- app/display/gimpsinglewindowstrategy.c | 14 +++++++------- app/display/gimpwindowstrategy.c | 24 ++++++++++++------------ app/display/gimpwindowstrategy.h | 22 +++++++++++----------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/app/actions/dialogs-commands.c b/app/actions/dialogs-commands.c index 0731500251..2390060252 100644 --- a/app/actions/dialogs-commands.c +++ b/app/actions/dialogs-commands.c @@ -61,9 +61,9 @@ dialogs_create_dockable_cmd_callback (GtkAction *action, return_if_no_widget (widget, data); if (value) - gimp_window_strategy_create_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (gimp)), - gimp, - gimp_dialog_factory_get_singleton (), - gtk_widget_get_screen (widget), - value); + gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (gimp)), + gimp, + gimp_dialog_factory_get_singleton (), + gtk_widget_get_screen (widget), + value); } diff --git a/app/display/gimpmultiwindowstrategy.c b/app/display/gimpmultiwindowstrategy.c index d7aa6c7c79..cdaf4ef61a 100644 --- a/app/display/gimpmultiwindowstrategy.c +++ b/app/display/gimpmultiwindowstrategy.c @@ -34,7 +34,7 @@ static void gimp_multi_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface); -static GtkWidget * gimp_multi_window_strategy_create_dockable_dialog (GimpWindowStrategy *strategy, +static GtkWidget * gimp_multi_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy, Gimp *gimp, GimpDialogFactory *factory, GdkScreen *screen, @@ -61,15 +61,15 @@ gimp_multi_window_strategy_init (GimpMultiWindowStrategy *strategy) static void gimp_multi_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface) { - iface->create_dockable_dialog = gimp_multi_window_strategy_create_dockable_dialog; + iface->show_dockable_dialog = gimp_multi_window_strategy_show_dockable_dialog; } static GtkWidget * -gimp_multi_window_strategy_create_dockable_dialog (GimpWindowStrategy *strategy, - Gimp *gimp, - GimpDialogFactory *factory, - GdkScreen *screen, - const gchar *identifiers) +gimp_multi_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy, + Gimp *gimp, + GimpDialogFactory *factory, + GdkScreen *screen, + const gchar *identifiers) { return gimp_dialog_factory_dialog_raise (factory, screen, identifiers, -1); } diff --git a/app/display/gimpsinglewindowstrategy.c b/app/display/gimpsinglewindowstrategy.c index 785f2303bf..600d34f43d 100644 --- a/app/display/gimpsinglewindowstrategy.c +++ b/app/display/gimpsinglewindowstrategy.c @@ -41,7 +41,7 @@ static void gimp_single_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface); -static GtkWidget * gimp_single_window_strategy_create_dockable_dialog (GimpWindowStrategy *strategy, +static GtkWidget * gimp_single_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy, Gimp *gimp, GimpDialogFactory *factory, GdkScreen *screen, @@ -68,15 +68,15 @@ gimp_single_window_strategy_init (GimpSingleWindowStrategy *strategy) static void gimp_single_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface) { - iface->create_dockable_dialog = gimp_single_window_strategy_create_dockable_dialog; + iface->show_dockable_dialog = gimp_single_window_strategy_show_dockable_dialog; } static GtkWidget * -gimp_single_window_strategy_create_dockable_dialog (GimpWindowStrategy *strategy, - Gimp *gimp, - GimpDialogFactory *factory, - GdkScreen *screen, - const gchar *identifiers) +gimp_single_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy, + Gimp *gimp, + GimpDialogFactory *factory, + GdkScreen *screen, + const gchar *identifiers) { GList *windows = gimp_get_image_windows (gimp); GtkWidget *widget = NULL; diff --git a/app/display/gimpwindowstrategy.c b/app/display/gimpwindowstrategy.c index 0959c2c1ef..c53f33a9a9 100644 --- a/app/display/gimpwindowstrategy.c +++ b/app/display/gimpwindowstrategy.c @@ -63,15 +63,15 @@ gimp_window_strategy_iface_base_init (GimpWindowStrategyInterface *strategy_ifac initialized = TRUE; - strategy_iface->create_dockable_dialog = NULL; + strategy_iface->show_dockable_dialog = NULL; } GtkWidget * -gimp_window_strategy_create_dockable_dialog (GimpWindowStrategy *strategy, - Gimp *gimp, - GimpDialogFactory *factory, - GdkScreen *screen, - const gchar *identifiers) +gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy, + Gimp *gimp, + GimpDialogFactory *factory, + GdkScreen *screen, + const gchar *identifiers) { GimpWindowStrategyInterface *iface; @@ -79,12 +79,12 @@ gimp_window_strategy_create_dockable_dialog (GimpWindowStrategy *strategy, iface = GIMP_WINDOW_STRATEGY_GET_INTERFACE (strategy); - if (iface->create_dockable_dialog) - return iface->create_dockable_dialog (strategy, - gimp, - factory, - screen, - identifiers); + if (iface->show_dockable_dialog) + return iface->show_dockable_dialog (strategy, + gimp, + factory, + screen, + identifiers); return NULL; } diff --git a/app/display/gimpwindowstrategy.h b/app/display/gimpwindowstrategy.h index aed3ad2a1f..bbfdacbc27 100644 --- a/app/display/gimpwindowstrategy.h +++ b/app/display/gimpwindowstrategy.h @@ -35,20 +35,20 @@ struct _GimpWindowStrategyInterface GTypeInterface base_iface; /* virtual functions */ - GtkWidget * (* create_dockable_dialog) (GimpWindowStrategy *strategy, - Gimp *gimp, - GimpDialogFactory *factory, - GdkScreen *screen, - const gchar *identifiers); + GtkWidget * (* show_dockable_dialog) (GimpWindowStrategy *strategy, + Gimp *gimp, + GimpDialogFactory *factory, + GdkScreen *screen, + const gchar *identifiers); }; -GType gimp_window_strategy_interface_get_type (void) G_GNUC_CONST; -GtkWidget * gimp_window_strategy_create_dockable_dialog (GimpWindowStrategy *strategy, - Gimp *gimp, - GimpDialogFactory *factory, - GdkScreen *screen, - const gchar *identifiers); +GType gimp_window_strategy_interface_get_type (void) G_GNUC_CONST; +GtkWidget * gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy, + Gimp *gimp, + GimpDialogFactory *factory, + GdkScreen *screen, + const gchar *identifiers); #endif /* __GIMP_WINDOW_STRATEGY_H__ */