callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: rename GimpWindowStrategy::create_dockable_dialog()

Browse Source 
to ::show_dockable_dialog() because that's what it wlays does, no
matter if the dialog has to be created or now.
This commit is contained in:
Michael Natterer
2012-01-30 22:59:09 +01:00
parent 4aa866a8b9
commit 79a66d36d2
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/actions/dialogs-commands.c
View File

@ -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);
}

14
app/display/gimpmultiwindowstrategy.c
View File

@ -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);
}

14
app/display/gimpsinglewindowstrategy.c
View File

@ -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;

24
app/display/gimpwindowstrategy.c
View File

@ -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;
}

22
app/display/gimpwindowstrategy.h
View File

@ -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__ */