[gimp/gimp-2-10] app: change all action callback signatures to use GimpAction
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] app: change all action callback signatures to use GimpAction
- Date: Tue, 2 Jul 2019 14:19:31 +0000 (UTC)
commit a1a8f0061780ebda3cd2a9e6eb7c3218eff0254b
Author: Michael Natterer <mitch gimp org>
Date: Tue Jul 2 16:12:18 2019 +0200
app: change all action callback signatures to use GimpAction
instead of GtkAction, which is correct now because all our actions
implement the GimpAction interface.
(cherry picked from commit b9d47f2d1f0abf47421cd958d07826bca4dcbfa6)
app/actions/buffers-commands.c | 14 +-
app/actions/buffers-commands.h | 14 +-
app/actions/channels-commands.c | 70 ++++-----
app/actions/channels-commands.h | 70 ++++-----
app/actions/colormap-commands.c | 16 +--
app/actions/colormap-commands.h | 16 +--
app/actions/context-commands.c | 176 +++++++++++------------
app/actions/context-commands.h | 226 +++++++++++++++---------------
app/actions/cursor-info-commands.c | 4 +-
app/actions/cursor-info-commands.h | 4 +-
app/actions/dashboard-commands.c | 32 ++---
app/actions/dashboard-commands.h | 38 ++---
app/actions/data-commands.c | 30 ++--
app/actions/data-commands.h | 16 +--
app/actions/data-editor-commands.c | 4 +-
app/actions/data-editor-commands.h | 4 +-
app/actions/debug-commands.c | 28 ++--
app/actions/debug-commands.h | 33 ++---
app/actions/dialogs-commands.c | 4 +-
app/actions/dialogs-commands.h | 4 +-
app/actions/dock-commands.c | 8 +-
app/actions/dock-commands.h | 8 +-
app/actions/dockable-commands.c | 36 ++---
app/actions/dockable-commands.h | 22 +--
app/actions/documents-commands.c | 40 +++---
app/actions/documents-commands.h | 40 +++---
app/actions/drawable-commands.c | 36 ++---
app/actions/drawable-commands.h | 36 ++---
app/actions/edit-commands.c | 68 ++++-----
app/actions/edit-commands.h | 76 +++++-----
app/actions/error-console-commands.c | 26 ++--
app/actions/error-console-commands.h | 26 ++--
app/actions/file-commands.c | 48 +++----
app/actions/file-commands.h | 60 ++++----
app/actions/gradient-editor-commands.c | 98 ++++++-------
app/actions/gradient-editor-commands.h | 98 ++++++-------
app/actions/gradients-commands.c | 4 +-
app/actions/gradients-commands.h | 4 +-
app/actions/help-commands.c | 8 +-
app/actions/help-commands.h | 8 +-
app/actions/image-commands.c | 102 +++++++-------
app/actions/image-commands.h | 102 +++++++-------
app/actions/images-commands.c | 12 +-
app/actions/images-commands.h | 12 +-
app/actions/items-commands.c | 46 +++---
app/actions/items-commands.h | 18 +--
app/actions/layers-commands.c | 202 +++++++++++++-------------
app/actions/layers-commands.h | 226 +++++++++++++++---------------
app/actions/palette-editor-commands.c | 20 +--
app/actions/palette-editor-commands.h | 20 +--
app/actions/palettes-commands.c | 8 +-
app/actions/palettes-commands.h | 8 +-
app/actions/plug-in-commands.c | 6 +-
app/actions/plug-in-commands.h | 4 +-
app/actions/quick-mask-commands.c | 14 +-
app/actions/quick-mask-commands.h | 14 +-
app/actions/sample-points-commands.c | 4 +-
app/actions/sample-points-commands.h | 4 +-
app/actions/select-commands.c | 60 ++++----
app/actions/select-commands.h | 60 ++++----
app/actions/templates-commands.c | 20 +--
app/actions/templates-commands.h | 20 +--
app/actions/text-editor-commands.c | 14 +-
app/actions/text-editor-commands.h | 14 +-
app/actions/text-tool-commands.c | 38 ++---
app/actions/text-tool-commands.h | 38 ++---
app/actions/tool-options-commands.c | 36 ++---
app/actions/tool-options-commands.h | 36 ++---
app/actions/tool-preset-editor-commands.c | 8 +-
app/actions/tool-preset-editor-commands.h | 8 +-
app/actions/tool-presets-commands.c | 8 +-
app/actions/tool-presets-commands.h | 8 +-
app/actions/tools-commands.c | 164 +++++++++++-----------
app/actions/tools-commands.h | 56 ++++----
app/actions/vectors-commands.c | 116 +++++++--------
app/actions/vectors-commands.h | 116 +++++++--------
app/actions/view-commands.c | 198 +++++++++++++-------------
app/actions/view-commands.h | 198 +++++++++++++-------------
app/actions/window-commands.c | 14 +-
app/actions/window-commands.h | 14 +-
app/actions/windows-commands.c | 64 ++++-----
app/actions/windows-commands.h | 43 +++---
82 files changed, 1863 insertions(+), 1863 deletions(-)
---
diff --git a/app/actions/buffers-commands.c b/app/actions/buffers-commands.c
index c491018c45..dea0a4272c 100644
--- a/app/actions/buffers-commands.c
+++ b/app/actions/buffers-commands.c
@@ -46,9 +46,9 @@
/* public functions */
void
-buffers_paste_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+buffers_paste_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
@@ -96,8 +96,8 @@ buffers_paste_cmd_callback (GtkAction *action,
}
void
-buffers_paste_as_new_image_cmd_callback (GtkAction *action,
- gpointer data)
+buffers_paste_as_new_image_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
@@ -125,8 +125,8 @@ buffers_paste_as_new_image_cmd_callback (GtkAction *action,
}
void
-buffers_delete_cmd_callback (GtkAction *action,
- gpointer data)
+buffers_delete_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
diff --git a/app/actions/buffers-commands.h b/app/actions/buffers-commands.h
index 6bdd229f3e..81a65e887d 100644
--- a/app/actions/buffers-commands.h
+++ b/app/actions/buffers-commands.h
@@ -19,13 +19,13 @@
#define __BUFFERS_COMMANDS_H__
-void buffers_paste_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void buffers_paste_as_new_image_cmd_callback (GtkAction *action,
- gpointer data);
-void buffers_delete_cmd_callback (GtkAction *action,
- gpointer data);
+void buffers_paste_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void buffers_paste_as_new_image_cmd_callback (GimpAction *action,
+ gpointer data);
+void buffers_delete_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __BUFFERS_COMMANDS_H__ */
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
index 842634cd99..5a0ae57905 100644
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@@ -90,8 +90,8 @@ static void channels_edit_attributes_callback (GtkWidget *dialog,
/* public functions */
void
-channels_edit_attributes_cmd_callback (GtkAction *action,
- gpointer data)
+channels_edit_attributes_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -136,8 +136,8 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
}
void
-channels_new_cmd_callback (GtkAction *action,
- gpointer data)
+channels_new_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -181,8 +181,8 @@ channels_new_cmd_callback (GtkAction *action,
}
void
-channels_new_last_vals_cmd_callback (GtkAction *action,
- gpointer data)
+channels_new_last_vals_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -207,8 +207,8 @@ channels_new_last_vals_cmd_callback (GtkAction *action,
}
void
-channels_raise_cmd_callback (GtkAction *action,
- gpointer data)
+channels_raise_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -219,8 +219,8 @@ channels_raise_cmd_callback (GtkAction *action,
}
void
-channels_raise_to_top_cmd_callback (GtkAction *action,
- gpointer data)
+channels_raise_to_top_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -231,8 +231,8 @@ channels_raise_to_top_cmd_callback (GtkAction *action,
}
void
-channels_lower_cmd_callback (GtkAction *action,
- gpointer data)
+channels_lower_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -243,8 +243,8 @@ channels_lower_cmd_callback (GtkAction *action,
}
void
-channels_lower_to_bottom_cmd_callback (GtkAction *action,
- gpointer data)
+channels_lower_to_bottom_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -255,8 +255,8 @@ channels_lower_to_bottom_cmd_callback (GtkAction *action,
}
void
-channels_duplicate_cmd_callback (GtkAction *action,
- gpointer data)
+channels_duplicate_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *new_channel;
@@ -307,8 +307,8 @@ channels_duplicate_cmd_callback (GtkAction *action,
}
void
-channels_delete_cmd_callback (GtkAction *action,
- gpointer data)
+channels_delete_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -319,9 +319,9 @@ channels_delete_cmd_callback (GtkAction *action,
}
void
-channels_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+channels_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpChannelOps op;
GimpImage *image;
@@ -351,8 +351,8 @@ channels_to_selection_cmd_callback (GtkAction *action,
}
void
-channels_visible_cmd_callback (GtkAction *action,
- gpointer data)
+channels_visible_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -362,8 +362,8 @@ channels_visible_cmd_callback (GtkAction *action,
}
void
-channels_linked_cmd_callback (GtkAction *action,
- gpointer data)
+channels_linked_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -373,8 +373,8 @@ channels_linked_cmd_callback (GtkAction *action,
}
void
-channels_lock_content_cmd_callback (GtkAction *action,
- gpointer data)
+channels_lock_content_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -384,8 +384,8 @@ channels_lock_content_cmd_callback (GtkAction *action,
}
void
-channels_lock_position_cmd_callback (GtkAction *action,
- gpointer data)
+channels_lock_position_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -395,9 +395,9 @@ channels_lock_position_cmd_callback (GtkAction *action,
}
void
-channels_color_tag_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+channels_color_tag_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -408,9 +408,9 @@ channels_color_tag_cmd_callback (GtkAction *action,
}
void
-channels_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+channels_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
diff --git a/app/actions/channels-commands.h b/app/actions/channels-commands.h
index aa79387d7b..6565a6899b 100644
--- a/app/actions/channels-commands.h
+++ b/app/actions/channels-commands.h
@@ -19,46 +19,46 @@
#define __CHANNELS_COMMANDS_H__
-void channels_edit_attributes_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_new_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_new_last_vals_cmd_callback (GtkAction *action,
- gpointer data);
+void channels_edit_attributes_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_new_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_new_last_vals_cmd_callback (GimpAction *action,
+ gpointer data);
-void channels_raise_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_raise_to_top_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_lower_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_lower_to_bottom_cmd_callback (GtkAction *action,
- gpointer data);
+void channels_raise_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_raise_to_top_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_lower_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_lower_to_bottom_cmd_callback (GimpAction *action,
+ gpointer data);
-void channels_duplicate_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_delete_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void channels_duplicate_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_delete_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void channels_visible_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_linked_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_lock_content_cmd_callback (GtkAction *action,
- gpointer data);
-void channels_lock_position_cmd_callback (GtkAction *action,
- gpointer data);
+void channels_visible_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_linked_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_lock_content_cmd_callback (GimpAction *action,
+ gpointer data);
+void channels_lock_position_cmd_callback (GimpAction *action,
+ gpointer data);
-void channels_color_tag_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void channels_color_tag_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void channels_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void channels_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
#endif /* __CHANNELS_COMMANDS_H__ */
diff --git a/app/actions/colormap-commands.c b/app/actions/colormap-commands.c
index 7c5ad28002..a3cefaf021 100644
--- a/app/actions/colormap-commands.c
+++ b/app/actions/colormap-commands.c
@@ -36,8 +36,8 @@
/* public functions */
void
-colormap_edit_color_cmd_callback (GtkAction *action,
- gpointer data)
+colormap_edit_color_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (data);
@@ -45,9 +45,9 @@ colormap_edit_color_cmd_callback (GtkAction *action,
}
void
-colormap_add_color_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+colormap_add_color_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpImage *image;
@@ -69,9 +69,9 @@ colormap_add_color_cmd_callback (GtkAction *action,
}
void
-colormap_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+colormap_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpColormapEditor *editor;
GimpImage *image;
diff --git a/app/actions/colormap-commands.h b/app/actions/colormap-commands.h
index 44acee8b95..10ab00293c 100644
--- a/app/actions/colormap-commands.h
+++ b/app/actions/colormap-commands.h
@@ -19,14 +19,14 @@
#define __COLORMAP_COMMANDS_H__
-void colormap_edit_color_cmd_callback (GtkAction *action,
- gpointer data);
-void colormap_add_color_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void colormap_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void colormap_edit_color_cmd_callback (GimpAction *action,
+ gpointer data);
+void colormap_add_color_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void colormap_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
#endif /* __COLORMAP_COMMANDS_H__ */
diff --git a/app/actions/context-commands.c b/app/actions/context-commands.c
index 19361958b8..75c1ad2660 100644
--- a/app/actions/context-commands.c
+++ b/app/actions/context-commands.c
@@ -81,8 +81,8 @@ static GimpColormapEditor * context_get_colormap_editor (void);
/* public functions */
void
-context_colors_default_cmd_callback (GtkAction *action,
- gpointer data)
+context_colors_default_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContext *context;
return_if_no_context (context, data);
@@ -91,8 +91,8 @@ context_colors_default_cmd_callback (GtkAction *action,
}
void
-context_colors_swap_cmd_callback (GtkAction *action,
- gpointer data)
+context_colors_swap_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContext *context;
return_if_no_context (context, data);
@@ -102,9 +102,9 @@ context_colors_swap_cmd_callback (GtkAction *action,
#define SELECT_COLOR_CMD_CALLBACK(name, fgbg, use_colormap, use_palette) \
void \
-context_##name##_##fgbg##ground_cmd_callback (GtkAction *action, \
- gint value, \
- gpointer data) \
+context_##name##_##fgbg##ground_cmd_callback (GimpAction *action, \
+ gint value, \
+ gpointer data) \
{ \
GimpContext *context; \
GimpRGB color; \
@@ -124,9 +124,9 @@ SELECT_COLOR_CMD_CALLBACK (swatch, fore, TRUE, TRUE)
SELECT_COLOR_CMD_CALLBACK (swatch, back, TRUE, TRUE)
void
-context_foreground_red_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_foreground_red_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -141,9 +141,9 @@ context_foreground_red_cmd_callback (GtkAction *action,
}
void
-context_foreground_green_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_foreground_green_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -158,9 +158,9 @@ context_foreground_green_cmd_callback (GtkAction *action,
}
void
-context_foreground_blue_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_foreground_blue_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -175,9 +175,9 @@ context_foreground_blue_cmd_callback (GtkAction *action,
}
void
-context_background_red_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_background_red_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -192,9 +192,9 @@ context_background_red_cmd_callback (GtkAction *action,
}
void
-context_background_green_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_background_green_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -209,9 +209,9 @@ context_background_green_cmd_callback (GtkAction *action,
}
void
-context_background_blue_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_background_blue_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -226,9 +226,9 @@ context_background_blue_cmd_callback (GtkAction *action,
}
void
-context_foreground_hue_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_foreground_hue_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -246,9 +246,9 @@ context_foreground_hue_cmd_callback (GtkAction *action,
}
void
-context_foreground_saturation_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_foreground_saturation_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -266,9 +266,9 @@ context_foreground_saturation_cmd_callback (GtkAction *action,
}
void
-context_foreground_value_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_foreground_value_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -286,9 +286,9 @@ context_foreground_value_cmd_callback (GtkAction *action,
}
void
-context_background_hue_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_background_hue_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -306,9 +306,9 @@ context_background_hue_cmd_callback (GtkAction *action,
}
void
-context_background_saturation_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_background_saturation_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -326,9 +326,9 @@ context_background_saturation_cmd_callback (GtkAction *action,
}
void
-context_background_value_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_background_value_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpRGB color;
@@ -346,9 +346,9 @@ context_background_value_cmd_callback (GtkAction *action,
}
void
-context_opacity_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_opacity_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -367,9 +367,9 @@ context_opacity_cmd_callback (GtkAction *action,
}
void
-context_paint_mode_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_paint_mode_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -414,9 +414,9 @@ context_paint_mode_cmd_callback (GtkAction *action,
}
void
-context_tool_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_tool_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
return_if_no_context (context, data);
@@ -426,9 +426,9 @@ context_tool_select_cmd_callback (GtkAction *action,
}
void
-context_brush_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_brush_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
return_if_no_context (context, data);
@@ -438,9 +438,9 @@ context_brush_select_cmd_callback (GtkAction *action,
}
void
-context_pattern_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_pattern_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
return_if_no_context (context, data);
@@ -450,9 +450,9 @@ context_pattern_select_cmd_callback (GtkAction *action,
}
void
-context_palette_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_palette_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
return_if_no_context (context, data);
@@ -462,9 +462,9 @@ context_palette_select_cmd_callback (GtkAction *action,
}
void
-context_gradient_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_gradient_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
return_if_no_context (context, data);
@@ -474,9 +474,9 @@ context_gradient_select_cmd_callback (GtkAction *action,
}
void
-context_font_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_font_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
return_if_no_context (context, data);
@@ -486,9 +486,9 @@ context_font_select_cmd_callback (GtkAction *action,
}
void
-context_brush_spacing_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_brush_spacing_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpBrush *brush;
@@ -507,9 +507,9 @@ context_brush_spacing_cmd_callback (GtkAction *action,
}
void
-context_brush_shape_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_brush_shape_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpBrush *brush;
@@ -540,9 +540,9 @@ context_brush_shape_cmd_callback (GtkAction *action,
}
void
-context_brush_radius_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_brush_radius_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpBrush *brush;
@@ -600,9 +600,9 @@ context_brush_radius_cmd_callback (GtkAction *action,
}
void
-context_brush_spikes_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_brush_spikes_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpBrush *brush;
@@ -622,9 +622,9 @@ context_brush_spikes_cmd_callback (GtkAction *action,
}
void
-context_brush_hardness_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_brush_hardness_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpBrush *brush;
@@ -644,9 +644,9 @@ context_brush_hardness_cmd_callback (GtkAction *action,
}
void
-context_brush_aspect_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_brush_aspect_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpBrush *brush;
@@ -666,9 +666,9 @@ context_brush_aspect_cmd_callback (GtkAction *action,
}
void
-context_brush_angle_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+context_brush_angle_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpBrush *brush;
diff --git a/app/actions/context-commands.h b/app/actions/context-commands.h
index f935b13c9c..6ecf4b7334 100644
--- a/app/actions/context-commands.h
+++ b/app/actions/context-commands.h
@@ -20,119 +20,119 @@
-void context_colors_default_cmd_callback (GtkAction *action,
- gpointer data);
-void context_colors_swap_cmd_callback (GtkAction *action,
- gpointer data);
-
-void context_palette_foreground_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_palette_background_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void context_colormap_foreground_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_colormap_background_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void context_swatch_foreground_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_swatch_background_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void context_foreground_red_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_foreground_green_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_foreground_blue_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void context_background_red_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_background_green_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_background_blue_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void context_foreground_hue_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_foreground_saturation_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_foreground_value_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void context_background_hue_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_background_saturation_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_background_value_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void context_opacity_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_paint_mode_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void context_tool_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_brush_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_pattern_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_palette_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_gradient_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_font_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void context_brush_spacing_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_brush_shape_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_brush_radius_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_brush_spikes_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_brush_hardness_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_brush_aspect_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void context_brush_angle_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void context_colors_default_cmd_callback (GimpAction *action,
+ gpointer data);
+void context_colors_swap_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void context_palette_foreground_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_palette_background_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void context_colormap_foreground_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_colormap_background_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void context_swatch_foreground_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_swatch_background_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void context_foreground_red_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_foreground_green_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_foreground_blue_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void context_background_red_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_background_green_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_background_blue_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void context_foreground_hue_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_foreground_saturation_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_foreground_value_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void context_background_hue_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_background_saturation_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_background_value_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void context_opacity_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_paint_mode_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void context_tool_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_brush_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_pattern_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_palette_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_gradient_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_font_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void context_brush_spacing_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_brush_shape_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_brush_radius_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_brush_spikes_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_brush_hardness_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_brush_aspect_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void context_brush_angle_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
#endif /* __CONTEXT_COMMANDS_H__ */
diff --git a/app/actions/cursor-info-commands.c b/app/actions/cursor-info-commands.c
index 774d780e18..327c5bd644 100644
--- a/app/actions/cursor-info-commands.c
+++ b/app/actions/cursor-info-commands.c
@@ -32,8 +32,8 @@
/* public functions */
void
-cursor_info_sample_merged_cmd_callback (GtkAction *action,
- gpointer data)
+cursor_info_sample_merged_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpCursorView *view = GIMP_CURSOR_VIEW (data);
gboolean active;
diff --git a/app/actions/cursor-info-commands.h b/app/actions/cursor-info-commands.h
index a2187b4c54..8051e7b6d2 100644
--- a/app/actions/cursor-info-commands.h
+++ b/app/actions/cursor-info-commands.h
@@ -19,8 +19,8 @@
#define __CURSOR_INFO_COMMANDS_H__
-void cursor_info_sample_merged_cmd_callback (GtkAction *action,
- gpointer data);
+void cursor_info_sample_merged_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __CURSOR_INFO_COMMANDS_H__ */
diff --git a/app/actions/dashboard-commands.c b/app/actions/dashboard-commands.c
index d9ffeb30cf..2d6ff68348 100644
--- a/app/actions/dashboard-commands.c
+++ b/app/actions/dashboard-commands.c
@@ -54,9 +54,9 @@ static void dashboard_log_add_marker_response (GtkWidget *dialog,
void
-dashboard_update_interval_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+dashboard_update_interval_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpDashboard *dashboard = GIMP_DASHBOARD (data);
GimpDashboardUpdateInteval update_interval;
@@ -68,9 +68,9 @@ dashboard_update_interval_cmd_callback (GtkAction *action,
}
void
-dashboard_history_duration_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+dashboard_history_duration_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpDashboard *dashboard = GIMP_DASHBOARD (data);
GimpDashboardHistoryDuration history_duration;
@@ -82,8 +82,8 @@ dashboard_history_duration_cmd_callback (GtkAction *action,
}
void
-dashboard_log_record_cmd_callback (GtkAction *action,
- gpointer data)
+dashboard_log_record_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDashboard *dashboard = GIMP_DASHBOARD (data);
@@ -185,8 +185,8 @@ dashboard_log_record_cmd_callback (GtkAction *action,
}
void
-dashboard_log_add_marker_cmd_callback (GtkAction *action,
- gpointer data)
+dashboard_log_add_marker_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDashboard *dashboard = GIMP_DASHBOARD (data);
GtkWidget *dialog;
@@ -215,8 +215,8 @@ dashboard_log_add_marker_cmd_callback (GtkAction *action,
}
void
-dashboard_log_add_empty_marker_cmd_callback (GtkAction *action,
- gpointer data)
+dashboard_log_add_empty_marker_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDashboard *dashboard = GIMP_DASHBOARD (data);
@@ -224,8 +224,8 @@ dashboard_log_add_empty_marker_cmd_callback (GtkAction *action,
}
void
-dashboard_reset_cmd_callback (GtkAction *action,
- gpointer data)
+dashboard_reset_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDashboard *dashboard = GIMP_DASHBOARD (data);
@@ -233,8 +233,8 @@ dashboard_reset_cmd_callback (GtkAction *action,
}
void
-dashboard_low_swap_space_warning_cmd_callback (GtkAction *action,
- gpointer data)
+dashboard_low_swap_space_warning_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDashboard *dashboard = GIMP_DASHBOARD (data);
gboolean low_swap_space_warning;
diff --git a/app/actions/dashboard-commands.h b/app/actions/dashboard-commands.h
index 326721e9fd..5e5755a466 100644
--- a/app/actions/dashboard-commands.h
+++ b/app/actions/dashboard-commands.h
@@ -19,25 +19,25 @@
#define __DASHBOARD_COMMANDS_H__
-void dashboard_update_interval_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void dashboard_history_duration_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-
-void dashboard_log_record_cmd_callback (GtkAction *action,
- gpointer data);
-void dashboard_log_add_marker_cmd_callback (GtkAction *action,
- gpointer data);
-void dashboard_log_add_empty_marker_cmd_callback (GtkAction *action,
- gpointer data);
-
-void dashboard_reset_cmd_callback (GtkAction *action,
- gpointer data);
-
-void dashboard_low_swap_space_warning_cmd_callback (GtkAction *action,
- gpointer data);
+void dashboard_update_interval_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void dashboard_history_duration_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+
+void dashboard_log_record_cmd_callback (GimpAction *action,
+ gpointer data);
+void dashboard_log_add_marker_cmd_callback (GimpAction *action,
+ gpointer data);
+void dashboard_log_add_empty_marker_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void dashboard_reset_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void dashboard_low_swap_space_warning_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __DASHBOARD_COMMANDS_H__ */
diff --git a/app/actions/data-commands.c b/app/actions/data-commands.c
index 0606908a8b..ba4e3c8a22 100644
--- a/app/actions/data-commands.c
+++ b/app/actions/data-commands.c
@@ -55,8 +55,8 @@
/* public functions */
void
-data_open_as_image_cmd_callback (GtkAction *action,
- gpointer user_data)
+data_open_as_image_cmd_callback (GimpAction *action,
+ gpointer user_data)
{
GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
GimpContext *context;
@@ -95,8 +95,8 @@ data_open_as_image_cmd_callback (GtkAction *action,
}
void
-data_new_cmd_callback (GtkAction *action,
- gpointer user_data)
+data_new_cmd_callback (GimpAction *action,
+ gpointer user_data)
{
GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
@@ -125,8 +125,8 @@ data_new_cmd_callback (GtkAction *action,
}
void
-data_duplicate_cmd_callback (GtkAction *action,
- gpointer user_data)
+data_duplicate_cmd_callback (GimpAction *action,
+ gpointer user_data)
{
GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
GimpContext *context;
@@ -156,8 +156,8 @@ data_duplicate_cmd_callback (GtkAction *action,
}
void
-data_copy_location_cmd_callback (GtkAction *action,
- gpointer user_data)
+data_copy_location_cmd_callback (GimpAction *action,
+ gpointer user_data)
{
GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
GimpContext *context;
@@ -184,8 +184,8 @@ data_copy_location_cmd_callback (GtkAction *action,
}
void
-data_show_in_file_manager_cmd_callback (GtkAction *action,
- gpointer user_data)
+data_show_in_file_manager_cmd_callback (GimpAction *action,
+ gpointer user_data)
{
GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
GimpContext *context;
@@ -218,8 +218,8 @@ data_show_in_file_manager_cmd_callback (GtkAction *action,
}
void
-data_delete_cmd_callback (GtkAction *action,
- gpointer user_data)
+data_delete_cmd_callback (GimpAction *action,
+ gpointer user_data)
{
GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
GimpContext *context;
@@ -248,8 +248,8 @@ data_delete_cmd_callback (GtkAction *action,
}
void
-data_refresh_cmd_callback (GtkAction *action,
- gpointer user_data)
+data_refresh_cmd_callback (GimpAction *action,
+ gpointer user_data)
{
GimpDataFactoryView *view = GIMP_DATA_FACTORY_VIEW (user_data);
Gimp *gimp;
@@ -262,7 +262,7 @@ data_refresh_cmd_callback (GtkAction *action,
}
void
-data_edit_cmd_callback (GtkAction *action,
+data_edit_cmd_callback (GimpAction *action,
const gchar *value,
gpointer user_data)
{
diff --git a/app/actions/data-commands.h b/app/actions/data-commands.h
index 79d32709b9..fd06c4943b 100644
--- a/app/actions/data-commands.h
+++ b/app/actions/data-commands.h
@@ -19,21 +19,21 @@
#define __DATA_COMMANDS_H__
-void data_open_as_image_cmd_callback (GtkAction *action,
+void data_open_as_image_cmd_callback (GimpAction *action,
gpointer data);
-void data_new_cmd_callback (GtkAction *action,
+void data_new_cmd_callback (GimpAction *action,
gpointer data);
-void data_duplicate_cmd_callback (GtkAction *action,
+void data_duplicate_cmd_callback (GimpAction *action,
gpointer data);
-void data_copy_location_cmd_callback (GtkAction *action,
+void data_copy_location_cmd_callback (GimpAction *action,
gpointer user_data);
-void data_show_in_file_manager_cmd_callback (GtkAction *action,
+void data_show_in_file_manager_cmd_callback (GimpAction *action,
gpointer user_data);
-void data_delete_cmd_callback (GtkAction *action,
+void data_delete_cmd_callback (GimpAction *action,
gpointer data);
-void data_refresh_cmd_callback (GtkAction *action,
+void data_refresh_cmd_callback (GimpAction *action,
gpointer data);
-void data_edit_cmd_callback (GtkAction *action,
+void data_edit_cmd_callback (GimpAction *action,
const gchar *value,
gpointer data);
diff --git a/app/actions/data-editor-commands.c b/app/actions/data-editor-commands.c
index e4aff4ed40..42d09c4d04 100644
--- a/app/actions/data-editor-commands.c
+++ b/app/actions/data-editor-commands.c
@@ -31,8 +31,8 @@
/* public functions */
void
-data_editor_edit_active_cmd_callback (GtkAction *action,
- gpointer data)
+data_editor_edit_active_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDataEditor *editor = GIMP_DATA_EDITOR (data);
gboolean edit_active;
diff --git a/app/actions/data-editor-commands.h b/app/actions/data-editor-commands.h
index 809a60ef65..6286e29724 100644
--- a/app/actions/data-editor-commands.h
+++ b/app/actions/data-editor-commands.h
@@ -19,8 +19,8 @@
#define __DATA_EDITOR_COMMANDS_H__
-void data_editor_edit_active_cmd_callback (GtkAction *action,
- gpointer data);
+void data_editor_edit_active_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __DATA_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/debug-commands.c b/app/actions/debug-commands.c
index 02660fdcaf..4050d561b2 100644
--- a/app/actions/debug-commands.c
+++ b/app/actions/debug-commands.c
@@ -72,8 +72,8 @@ static gboolean debug_accel_find_func (GtkAccelKey *key,
/* public functions */
void
-debug_mem_profile_cmd_callback (GtkAction *action,
- gpointer data)
+debug_mem_profile_cmd_callback (GimpAction *action,
+ gpointer data)
{
extern gboolean gimp_debug_memsize;
Gimp *gimp;
@@ -87,8 +87,8 @@ debug_mem_profile_cmd_callback (GtkAction *action,
}
void
-debug_benchmark_projection_cmd_callback (GtkAction *action,
- gpointer data)
+debug_benchmark_projection_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
return_if_no_display (display, data);
@@ -97,8 +97,8 @@ debug_benchmark_projection_cmd_callback (GtkAction *action,
}
void
-debug_show_image_graph_cmd_callback (GtkAction *action,
- gpointer data)
+debug_show_image_graph_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *source_image = NULL;
return_if_no_image (source_image, data);
@@ -107,8 +107,8 @@ debug_show_image_graph_cmd_callback (GtkAction *action,
}
void
-debug_dump_menus_cmd_callback (GtkAction *action,
- gpointer data)
+debug_dump_menus_cmd_callback (GimpAction *action,
+ gpointer data)
{
GList *list;
@@ -148,8 +148,8 @@ debug_dump_menus_cmd_callback (GtkAction *action,
}
void
-debug_dump_managers_cmd_callback (GtkAction *action,
- gpointer data)
+debug_dump_managers_cmd_callback (GimpAction *action,
+ gpointer data)
{
GList *list;
@@ -176,8 +176,8 @@ debug_dump_managers_cmd_callback (GtkAction *action,
}
void
-debug_dump_keyboard_shortcuts_cmd_callback (GtkAction *action,
- gpointer data)
+debug_dump_keyboard_shortcuts_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImageWindow *window;
@@ -265,8 +265,8 @@ debug_dump_keyboard_shortcuts_cmd_callback (GtkAction *action,
}
void
-debug_dump_attached_data_cmd_callback (GtkAction *action,
- gpointer data)
+debug_dump_attached_data_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp = action_data_get_gimp (data);
GimpContext *user_context = gimp_get_user_context (gimp);
diff --git a/app/actions/debug-commands.h b/app/actions/debug-commands.h
index 8bc4128720..67ceac1ded 100644
--- a/app/actions/debug-commands.h
+++ b/app/actions/debug-commands.h
@@ -19,21 +19,22 @@
#define __DEBUG_COMMANDS_H__
-void debug_mem_profile_cmd_callback (GtkAction *action,
- gpointer data);
-void debug_benchmark_projection_cmd_callback (GtkAction *action,
- gpointer data);
-void debug_show_image_graph_cmd_callback (GtkAction *action,
- gpointer data);
-void debug_dump_menus_cmd_callback (GtkAction *action,
- gpointer data);
-void debug_dump_managers_cmd_callback (GtkAction *action,
- gpointer data);
-void debug_dump_keyboard_shortcuts_cmd_callback (GtkAction *action,
- gpointer data);
-void debug_dump_attached_data_cmd_callback (GtkAction *action,
- gpointer data);
-void debug_benchmark_projection_cmd_callback (GtkAction *action,
- gpointer data);
+void debug_mem_profile_cmd_callback (GimpAction *action,
+ gpointer data);
+void debug_benchmark_projection_cmd_callback (GimpAction *action,
+ gpointer data);
+void debug_show_image_graph_cmd_callback (GimpAction *action,
+ gpointer data);
+void debug_dump_menus_cmd_callback (GimpAction *action,
+ gpointer data);
+void debug_dump_managers_cmd_callback (GimpAction *action,
+ gpointer data);
+void debug_dump_keyboard_shortcuts_cmd_callback (GimpAction *action,
+ gpointer data);
+void debug_dump_attached_data_cmd_callback (GimpAction *action,
+ gpointer data);
+void debug_benchmark_projection_cmd_callback (GimpAction *action,
+ gpointer data);
+
#endif /* __DEBUG_COMMANDS_H__ */
diff --git a/app/actions/dialogs-commands.c b/app/actions/dialogs-commands.c
index 125e4c5d47..56a7b92788 100644
--- a/app/actions/dialogs-commands.c
+++ b/app/actions/dialogs-commands.c
@@ -37,7 +37,7 @@
/* public functions */
void
-dialogs_create_toplevel_cmd_callback (GtkAction *action,
+dialogs_create_toplevel_cmd_callback (GimpAction *action,
const gchar *value,
gpointer data)
{
@@ -53,7 +53,7 @@ dialogs_create_toplevel_cmd_callback (GtkAction *action,
}
void
-dialogs_create_dockable_cmd_callback (GtkAction *action,
+dialogs_create_dockable_cmd_callback (GimpAction *action,
const gchar *value,
gpointer data)
{
diff --git a/app/actions/dialogs-commands.h b/app/actions/dialogs-commands.h
index e26e6c3025..772613b6d4 100644
--- a/app/actions/dialogs-commands.h
+++ b/app/actions/dialogs-commands.h
@@ -19,10 +19,10 @@
#define __DIALOGS_COMMANDS_H__
-void dialogs_create_toplevel_cmd_callback (GtkAction *action,
+void dialogs_create_toplevel_cmd_callback (GimpAction *action,
const gchar *value,
gpointer data);
-void dialogs_create_dockable_cmd_callback (GtkAction *action,
+void dialogs_create_dockable_cmd_callback (GimpAction *action,
const gchar *value,
gpointer data);
diff --git a/app/actions/dock-commands.c b/app/actions/dock-commands.c
index d6c5cbc9a3..527c58cd3a 100644
--- a/app/actions/dock-commands.c
+++ b/app/actions/dock-commands.c
@@ -48,8 +48,8 @@ dock_commands_get_dock_window_from_widget (GtkWidget *widget)
/* public functions */
void
-dock_toggle_image_menu_cmd_callback (GtkAction *action,
- gpointer data)
+dock_toggle_image_menu_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWidget *widget = NULL;
GimpDockWindow *dock_window = NULL;
@@ -67,8 +67,8 @@ dock_toggle_image_menu_cmd_callback (GtkAction *action,
}
void
-dock_toggle_auto_cmd_callback (GtkAction *action,
- gpointer data)
+dock_toggle_auto_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWidget *widget = NULL;
GimpDockWindow *dock_window = NULL;
diff --git a/app/actions/dock-commands.h b/app/actions/dock-commands.h
index 89ca478c1e..4e0adfdf09 100644
--- a/app/actions/dock-commands.h
+++ b/app/actions/dock-commands.h
@@ -19,10 +19,10 @@
#define __DOCK_COMMANDS_H__
-void dock_toggle_image_menu_cmd_callback (GtkAction *action,
- gpointer data);
-void dock_toggle_auto_cmd_callback (GtkAction *action,
- gpointer data);
+void dock_toggle_image_menu_cmd_callback (GimpAction *action,
+ gpointer data);
+void dock_toggle_auto_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __DOCK_COMMANDS_H__ */
diff --git a/app/actions/dockable-commands.c b/app/actions/dockable-commands.c
index 7faeabacc7..b79cb19fb7 100644
--- a/app/actions/dockable-commands.c
+++ b/app/actions/dockable-commands.c
@@ -46,7 +46,7 @@ static GimpDockable * dockable_get_current (GimpDockbook *dockbook);
/* public functions */
void
-dockable_add_tab_cmd_callback (GtkAction *action,
+dockable_add_tab_cmd_callback (GimpAction *action,
const gchar *value,
gpointer data)
{
@@ -58,8 +58,8 @@ dockable_add_tab_cmd_callback (GtkAction *action,
}
void
-dockable_close_tab_cmd_callback (GtkAction *action,
- gpointer data)
+dockable_close_tab_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable = dockable_get_current (dockbook);
@@ -74,8 +74,8 @@ dockable_close_tab_cmd_callback (GtkAction *action,
}
void
-dockable_detach_tab_cmd_callback (GtkAction *action,
- gpointer data)
+dockable_detach_tab_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable = dockable_get_current (dockbook);
@@ -85,8 +85,8 @@ dockable_detach_tab_cmd_callback (GtkAction *action,
}
void
-dockable_lock_tab_cmd_callback (GtkAction *action,
- gpointer data)
+dockable_lock_tab_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable = dockable_get_current (dockbook);
@@ -101,9 +101,9 @@ dockable_lock_tab_cmd_callback (GtkAction *action,
}
void
-dockable_toggle_view_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+dockable_toggle_view_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable;
@@ -214,9 +214,9 @@ dockable_toggle_view_cmd_callback (GtkAction *action,
}
void
-dockable_view_size_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+dockable_view_size_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable = dockable_get_current (dockbook);
@@ -242,9 +242,9 @@ dockable_view_size_cmd_callback (GtkAction *action,
}
void
-dockable_tab_style_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+dockable_tab_style_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable = dockable_get_current (dockbook);
@@ -268,8 +268,8 @@ dockable_tab_style_cmd_callback (GtkAction *action,
}
void
-dockable_show_button_bar_cmd_callback (GtkAction *action,
- gpointer data)
+dockable_show_button_bar_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDockbook *dockbook = GIMP_DOCKBOOK (data);
GimpDockable *dockable = dockable_get_current (dockbook);
diff --git a/app/actions/dockable-commands.h b/app/actions/dockable-commands.h
index ed4116a4fd..cc9e728cbf 100644
--- a/app/actions/dockable-commands.h
+++ b/app/actions/dockable-commands.h
@@ -19,26 +19,26 @@
#define __DOCKABLE_COMMANDS_H__
-void dockable_add_tab_cmd_callback (GtkAction *action,
+void dockable_add_tab_cmd_callback (GimpAction *action,
const gchar *value,
gpointer data);
-void dockable_close_tab_cmd_callback (GtkAction *action,
+void dockable_close_tab_cmd_callback (GimpAction *action,
gpointer data);
-void dockable_detach_tab_cmd_callback (GtkAction *action,
+void dockable_detach_tab_cmd_callback (GimpAction *action,
gpointer data);
-void dockable_lock_tab_cmd_callback (GtkAction *action,
+void dockable_lock_tab_cmd_callback (GimpAction *action,
gpointer data);
-void dockable_toggle_view_cmd_callback (GtkAction *action,
- GtkAction *current,
+void dockable_toggle_view_cmd_callback (GimpAction *action,
+ GimpAction *current,
gpointer data);
-void dockable_view_size_cmd_callback (GtkAction *action,
- GtkAction *current,
+void dockable_view_size_cmd_callback (GimpAction *action,
+ GimpAction *current,
gpointer data);
-void dockable_tab_style_cmd_callback (GtkAction *action,
- GtkAction *current,
+void dockable_tab_style_cmd_callback (GimpAction *action,
+ GimpAction *current,
gpointer data);
-void dockable_show_button_bar_cmd_callback (GtkAction *action,
+void dockable_show_button_bar_cmd_callback (GimpAction *action,
gpointer data);
diff --git a/app/actions/documents-commands.c b/app/actions/documents-commands.c
index 59b760f912..311b306984 100644
--- a/app/actions/documents-commands.c
+++ b/app/actions/documents-commands.c
@@ -75,8 +75,8 @@ static void documents_raise_display (GimpDisplay *display,
/* public functions */
void
-documents_open_cmd_callback (GtkAction *action,
- gpointer data)
+documents_open_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
@@ -99,8 +99,8 @@ documents_open_cmd_callback (GtkAction *action,
}
void
-documents_raise_or_open_cmd_callback (GtkAction *action,
- gpointer data)
+documents_raise_or_open_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
@@ -129,8 +129,8 @@ documents_raise_or_open_cmd_callback (GtkAction *action,
}
void
-documents_file_open_dialog_cmd_callback (GtkAction *action,
- gpointer data)
+documents_file_open_dialog_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
@@ -151,8 +151,8 @@ documents_file_open_dialog_cmd_callback (GtkAction *action,
}
void
-documents_copy_location_cmd_callback (GtkAction *action,
- gpointer data)
+documents_copy_location_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
@@ -167,8 +167,8 @@ documents_copy_location_cmd_callback (GtkAction *action,
}
void
-documents_show_in_file_manager_cmd_callback (GtkAction *action,
- gpointer data)
+documents_show_in_file_manager_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
@@ -196,8 +196,8 @@ documents_show_in_file_manager_cmd_callback (GtkAction *action,
}
void
-documents_remove_cmd_callback (GtkAction *action,
- gpointer data)
+documents_remove_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context = gimp_container_view_get_context (editor->view);
@@ -212,8 +212,8 @@ documents_remove_cmd_callback (GtkAction *action,
}
void
-documents_clear_cmd_callback (GtkAction *action,
- gpointer data)
+documents_clear_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context = gimp_container_view_get_context (editor->view);
@@ -282,8 +282,8 @@ documents_clear_cmd_callback (GtkAction *action,
}
void
-documents_recreate_preview_cmd_callback (GtkAction *action,
- gpointer data)
+documents_recreate_preview_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
@@ -313,8 +313,8 @@ documents_recreate_preview_cmd_callback (GtkAction *action,
}
void
-documents_reload_previews_cmd_callback (GtkAction *action,
- gpointer data)
+documents_reload_previews_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
@@ -344,8 +344,8 @@ documents_remove_dangling_foreach (GimpImagefile *imagefile,
}
void
-documents_remove_dangling_cmd_callback (GtkAction *action,
- gpointer data)
+documents_remove_dangling_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
diff --git a/app/actions/documents-commands.h b/app/actions/documents-commands.h
index d545f2d985..70b77b3099 100644
--- a/app/actions/documents-commands.h
+++ b/app/actions/documents-commands.h
@@ -19,26 +19,26 @@
#define __DOCUMENTS_COMMANDS_H__
-void documents_open_cmd_callback (GtkAction *action,
- gpointer data);
-void documents_raise_or_open_cmd_callback (GtkAction *action,
- gpointer data);
-void documents_file_open_dialog_cmd_callback (GtkAction *action,
- gpointer data);
-void documents_copy_location_cmd_callback (GtkAction *action,
- gpointer data);
-void documents_show_in_file_manager_cmd_callback (GtkAction *action,
- gpointer data);
-void documents_remove_cmd_callback (GtkAction *action,
- gpointer data);
-void documents_clear_cmd_callback (GtkAction *action,
- gpointer data);
-void documents_recreate_preview_cmd_callback (GtkAction *action,
- gpointer data);
-void documents_reload_previews_cmd_callback (GtkAction *action,
- gpointer data);
-void documents_remove_dangling_cmd_callback (GtkAction *action,
- gpointer data);
+void documents_open_cmd_callback (GimpAction *action,
+ gpointer data);
+void documents_raise_or_open_cmd_callback (GimpAction *action,
+ gpointer data);
+void documents_file_open_dialog_cmd_callback (GimpAction *action,
+ gpointer data);
+void documents_copy_location_cmd_callback (GimpAction *action,
+ gpointer data);
+void documents_show_in_file_manager_cmd_callback (GimpAction *action,
+ gpointer data);
+void documents_remove_cmd_callback (GimpAction *action,
+ gpointer data);
+void documents_clear_cmd_callback (GimpAction *action,
+ gpointer data);
+void documents_recreate_preview_cmd_callback (GimpAction *action,
+ gpointer data);
+void documents_reload_previews_cmd_callback (GimpAction *action,
+ gpointer data);
+void documents_remove_dangling_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __DOCUMENTS_COMMANDS_H__ */
diff --git a/app/actions/drawable-commands.c b/app/actions/drawable-commands.c
index 287454dee7..ec0de4755e 100644
--- a/app/actions/drawable-commands.c
+++ b/app/actions/drawable-commands.c
@@ -48,8 +48,8 @@
/* public functions */
void
-drawable_equalize_cmd_callback (GtkAction *action,
- gpointer data)
+drawable_equalize_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -60,8 +60,8 @@ drawable_equalize_cmd_callback (GtkAction *action,
}
void
-drawable_levels_stretch_cmd_callback (GtkAction *action,
- gpointer data)
+drawable_levels_stretch_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -85,8 +85,8 @@ drawable_levels_stretch_cmd_callback (GtkAction *action,
}
void
-drawable_linked_cmd_callback (GtkAction *action,
- gpointer data)
+drawable_linked_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -116,8 +116,8 @@ drawable_linked_cmd_callback (GtkAction *action,
}
void
-drawable_visible_cmd_callback (GtkAction *action,
- gpointer data)
+drawable_visible_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -147,8 +147,8 @@ drawable_visible_cmd_callback (GtkAction *action,
}
void
-drawable_lock_content_cmd_callback (GtkAction *action,
- gpointer data)
+drawable_lock_content_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -182,8 +182,8 @@ drawable_lock_content_cmd_callback (GtkAction *action,
}
void
-drawable_lock_position_cmd_callback (GtkAction *action,
- gpointer data)
+drawable_lock_position_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -213,9 +213,9 @@ drawable_lock_position_cmd_callback (GtkAction *action,
}
void
-drawable_flip_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+drawable_flip_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -259,9 +259,9 @@ drawable_flip_cmd_callback (GtkAction *action,
}
void
-drawable_rotate_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+drawable_rotate_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
diff --git a/app/actions/drawable-commands.h b/app/actions/drawable-commands.h
index b678faf359..56f7c35e25 100644
--- a/app/actions/drawable-commands.h
+++ b/app/actions/drawable-commands.h
@@ -19,26 +19,26 @@
#define __DRAWABLE_COMMANDS_H__
-void drawable_equalize_cmd_callback (GtkAction *action,
- gpointer data);
-void drawable_levels_stretch_cmd_callback (GtkAction *action,
- gpointer data);
+void drawable_equalize_cmd_callback (GimpAction *action,
+ gpointer data);
+void drawable_levels_stretch_cmd_callback (GimpAction *action,
+ gpointer data);
-void drawable_linked_cmd_callback (GtkAction *action,
- gpointer data);
-void drawable_visible_cmd_callback (GtkAction *action,
- gpointer data);
-void drawable_lock_content_cmd_callback (GtkAction *action,
- gpointer data);
-void drawable_lock_position_cmd_callback (GtkAction *action,
- gpointer data);
+void drawable_linked_cmd_callback (GimpAction *action,
+ gpointer data);
+void drawable_visible_cmd_callback (GimpAction *action,
+ gpointer data);
+void drawable_lock_content_cmd_callback (GimpAction *action,
+ gpointer data);
+void drawable_lock_position_cmd_callback (GimpAction *action,
+ gpointer data);
-void drawable_flip_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void drawable_rotate_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void drawable_flip_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void drawable_rotate_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
#endif /* __DRAWABLE_COMMANDS_H__ */
diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c
index 6645de486a..c4c5c521f5 100644
--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@@ -83,8 +83,8 @@ static void copy_named_visible_buffer_callback (GtkWidget *widget,
/* public functions */
void
-edit_undo_cmd_callback (GtkAction *action,
- gpointer data)
+edit_undo_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDisplay *display;
@@ -99,8 +99,8 @@ edit_undo_cmd_callback (GtkAction *action,
}
void
-edit_redo_cmd_callback (GtkAction *action,
- gpointer data)
+edit_redo_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDisplay *display;
@@ -115,8 +115,8 @@ edit_redo_cmd_callback (GtkAction *action,
}
void
-edit_strong_undo_cmd_callback (GtkAction *action,
- gpointer data)
+edit_strong_undo_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -126,8 +126,8 @@ edit_strong_undo_cmd_callback (GtkAction *action,
}
void
-edit_strong_redo_cmd_callback (GtkAction *action,
- gpointer data)
+edit_strong_redo_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -137,8 +137,8 @@ edit_strong_redo_cmd_callback (GtkAction *action,
}
void
-edit_undo_clear_cmd_callback (GtkAction *action,
- gpointer data)
+edit_undo_clear_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpUndoStack *undo_stack;
@@ -206,8 +206,8 @@ edit_undo_clear_cmd_callback (GtkAction *action,
}
void
-edit_cut_cmd_callback (GtkAction *action,
- gpointer data)
+edit_cut_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -245,8 +245,8 @@ edit_cut_cmd_callback (GtkAction *action,
}
void
-edit_copy_cmd_callback (GtkAction *action,
- gpointer data)
+edit_copy_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -281,8 +281,8 @@ edit_copy_cmd_callback (GtkAction *action,
}
void
-edit_copy_visible_cmd_callback (GtkAction *action,
- gpointer data)
+edit_copy_visible_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GError *error = NULL;
@@ -310,9 +310,9 @@ edit_copy_visible_cmd_callback (GtkAction *action,
}
void
-edit_paste_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+edit_paste_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpDisplay *display = action_data_get_display (data);
GimpPasteType paste_type = (GimpPasteType) value;
@@ -346,8 +346,8 @@ edit_paste_cmd_callback (GtkAction *action,
}
void
-edit_paste_as_new_image_cmd_callback (GtkAction *action,
- gpointer data)
+edit_paste_as_new_image_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GtkWidget *widget;
@@ -380,8 +380,8 @@ edit_paste_as_new_image_cmd_callback (GtkAction *action,
}
void
-edit_named_cut_cmd_callback (GtkAction *action,
- gpointer data)
+edit_named_cut_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -400,8 +400,8 @@ edit_named_cut_cmd_callback (GtkAction *action,
}
void
-edit_named_copy_cmd_callback (GtkAction *action,
- gpointer data)
+edit_named_copy_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -420,8 +420,8 @@ edit_named_copy_cmd_callback (GtkAction *action,
}
void
-edit_named_copy_visible_cmd_callback (GtkAction *action,
- gpointer data)
+edit_named_copy_visible_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -440,8 +440,8 @@ edit_named_copy_visible_cmd_callback (GtkAction *action,
}
void
-edit_named_paste_cmd_callback (GtkAction *action,
- gpointer data)
+edit_named_paste_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GtkWidget *widget;
@@ -457,8 +457,8 @@ edit_named_paste_cmd_callback (GtkAction *action,
}
void
-edit_clear_cmd_callback (GtkAction *action,
- gpointer data)
+edit_clear_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
@@ -472,9 +472,9 @@ edit_clear_cmd_callback (GtkAction *action,
}
void
-edit_fill_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+edit_fill_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpDrawable *drawable;
diff --git a/app/actions/edit-commands.h b/app/actions/edit-commands.h
index b56af6b9d2..fddc06cbca 100644
--- a/app/actions/edit-commands.h
+++ b/app/actions/edit-commands.h
@@ -19,44 +19,44 @@
#define __EDIT_COMMANDS_H__
-void edit_undo_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_redo_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_strong_undo_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_strong_redo_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_undo_clear_cmd_callback (GtkAction *action,
- gpointer data);
-
-void edit_cut_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_copy_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_copy_visible_cmd_callback (GtkAction *action,
- gpointer data);
-
-void edit_paste_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void edit_paste_as_new_image_cmd_callback (GtkAction *action,
- gpointer data);
-
-void edit_named_cut_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_named_copy_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_named_copy_visible_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_named_paste_cmd_callback (GtkAction *action,
- gpointer data);
-
-void edit_clear_cmd_callback (GtkAction *action,
- gpointer data);
-void edit_fill_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void edit_undo_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_redo_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_strong_undo_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_strong_redo_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_undo_clear_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void edit_cut_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_copy_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_copy_visible_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void edit_paste_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void edit_paste_as_new_image_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void edit_named_cut_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_named_copy_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_named_copy_visible_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_named_paste_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void edit_clear_cmd_callback (GimpAction *action,
+ gpointer data);
+void edit_fill_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
#endif /* __EDIT_COMMANDS_H__ */
diff --git a/app/actions/error-console-commands.c b/app/actions/error-console-commands.c
index 7969bf8bec..14d5a1f4b0 100644
--- a/app/actions/error-console-commands.c
+++ b/app/actions/error-console-commands.c
@@ -47,8 +47,8 @@ static void error_console_save_response (GtkWidget *dialog,
/* public functions */
void
-error_console_clear_cmd_callback (GtkAction *action,
- gpointer data)
+error_console_clear_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
GtkTextIter start_iter;
@@ -59,8 +59,8 @@ error_console_clear_cmd_callback (GtkAction *action,
}
void
-error_console_select_all_cmd_callback (GtkAction *action,
- gpointer data)
+error_console_select_all_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
GtkTextIter start_iter;
@@ -71,9 +71,9 @@ error_console_select_all_cmd_callback (GtkAction *action,
}
void
-error_console_save_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+error_console_save_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
@@ -133,8 +133,8 @@ error_console_save_cmd_callback (GtkAction *action,
}
void
-error_console_highlight_error_cmd_callback (GtkAction *action,
- gpointer data)
+error_console_highlight_error_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
gboolean active;
@@ -145,8 +145,8 @@ error_console_highlight_error_cmd_callback (GtkAction *action,
}
void
-error_console_highlight_warning_cmd_callback (GtkAction *action,
- gpointer data)
+error_console_highlight_warning_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
gboolean active;
@@ -157,8 +157,8 @@ error_console_highlight_warning_cmd_callback (GtkAction *action,
}
void
-error_console_highlight_info_cmd_callback (GtkAction *action,
- gpointer data)
+error_console_highlight_info_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
gboolean active;
diff --git a/app/actions/error-console-commands.h b/app/actions/error-console-commands.h
index d69dc79620..47c69a6f87 100644
--- a/app/actions/error-console-commands.h
+++ b/app/actions/error-console-commands.h
@@ -19,20 +19,20 @@
#define __ERROR_CONSOLE_COMMANDS_H__
-void error_console_clear_cmd_callback (GtkAction *action,
- gpointer data);
-void error_console_select_all_cmd_callback (GtkAction *action,
- gpointer data);
-void error_console_save_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void error_console_clear_cmd_callback (GimpAction *action,
+ gpointer data);
+void error_console_select_all_cmd_callback (GimpAction *action,
+ gpointer data);
+void error_console_save_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void error_console_highlight_error_cmd_callback (GtkAction *action,
- gpointer data);
-void error_console_highlight_warning_cmd_callback (GtkAction *action,
- gpointer data);
-void error_console_highlight_info_cmd_callback (GtkAction *action,
- gpointer data);
+void error_console_highlight_error_cmd_callback (GimpAction *action,
+ gpointer data);
+void error_console_highlight_warning_cmd_callback (GimpAction *action,
+ gpointer data);
+void error_console_highlight_info_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __ERROR_CONSOLE_COMMANDS_H__ */
diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c
index 5135887d29..0a5d4113c1 100644
--- a/app/actions/file-commands.c
+++ b/app/actions/file-commands.c
@@ -103,8 +103,8 @@ static void file_revert_confirm_response (GtkWidget *dialog,
void
-file_open_cmd_callback (GtkAction *action,
- gpointer data)
+file_open_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GtkWidget *widget;
@@ -120,8 +120,8 @@ file_open_cmd_callback (GtkAction *action,
}
void
-file_open_as_layers_cmd_callback (GtkAction *action,
- gpointer data)
+file_open_as_layers_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GtkWidget *widget;
@@ -141,8 +141,8 @@ file_open_as_layers_cmd_callback (GtkAction *action,
}
void
-file_open_location_cmd_callback (GtkAction *action,
- gpointer data)
+file_open_location_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
@@ -155,9 +155,9 @@ file_open_location_cmd_callback (GtkAction *action,
}
void
-file_open_recent_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+file_open_recent_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
Gimp *gimp;
GimpImagefile *imagefile;
@@ -213,9 +213,9 @@ file_open_recent_cmd_callback (GtkAction *action,
}
void
-file_save_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+file_save_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
Gimp *gimp;
GimpDisplay *display;
@@ -354,8 +354,8 @@ file_save_cmd_callback (GtkAction *action,
}
void
-file_create_template_cmd_callback (GtkAction *action,
- gpointer data)
+file_create_template_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -376,8 +376,8 @@ file_create_template_cmd_callback (GtkAction *action,
}
void
-file_revert_cmd_callback (GtkAction *action,
- gpointer data)
+file_revert_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -448,8 +448,8 @@ file_revert_cmd_callback (GtkAction *action,
}
void
-file_close_all_cmd_callback (GtkAction *action,
- gpointer data)
+file_close_all_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
return_if_no_gimp (gimp, data);
@@ -471,8 +471,8 @@ file_close_all_cmd_callback (GtkAction *action,
}
void
-file_copy_location_cmd_callback (GtkAction *action,
- gpointer data)
+file_copy_location_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GimpDisplay *display;
@@ -495,8 +495,8 @@ file_copy_location_cmd_callback (GtkAction *action,
}
void
-file_show_in_file_manager_cmd_callback (GtkAction *action,
- gpointer data)
+file_show_in_file_manager_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GimpDisplay *display;
@@ -524,8 +524,8 @@ file_show_in_file_manager_cmd_callback (GtkAction *action,
}
void
-file_quit_cmd_callback (GtkAction *action,
- gpointer data)
+file_quit_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
return_if_no_gimp (gimp, data);
diff --git a/app/actions/file-commands.h b/app/actions/file-commands.h
index 366110be05..40fef7590d 100644
--- a/app/actions/file-commands.h
+++ b/app/actions/file-commands.h
@@ -19,36 +19,36 @@
#define __FILE_COMMANDS_H__
-void file_open_cmd_callback (GtkAction *action,
- gpointer data);
-void file_open_as_layers_cmd_callback (GtkAction *action,
- gpointer data);
-void file_open_location_cmd_callback (GtkAction *action,
- gpointer data);
-void file_open_recent_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void file_save_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void file_create_template_cmd_callback (GtkAction *action,
- gpointer data);
-
-void file_revert_cmd_callback (GtkAction *action,
- gpointer data);
-void file_close_all_cmd_callback (GtkAction *action,
- gpointer data);
-void file_copy_location_cmd_callback (GtkAction *action,
- gpointer data);
-void file_show_in_file_manager_cmd_callback (GtkAction *action,
- gpointer data);
-void file_quit_cmd_callback (GtkAction *action,
- gpointer data);
-
-void file_file_open_dialog (Gimp *gimp,
- GFile *file,
- GtkWidget *parent);
+void file_open_cmd_callback (GimpAction *action,
+ gpointer data);
+void file_open_as_layers_cmd_callback (GimpAction *action,
+ gpointer data);
+void file_open_location_cmd_callback (GimpAction *action,
+ gpointer data);
+void file_open_recent_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void file_save_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void file_create_template_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void file_revert_cmd_callback (GimpAction *action,
+ gpointer data);
+void file_close_all_cmd_callback (GimpAction *action,
+ gpointer data);
+void file_copy_location_cmd_callback (GimpAction *action,
+ gpointer data);
+void file_show_in_file_manager_cmd_callback (GimpAction *action,
+ gpointer data);
+void file_quit_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void file_file_open_dialog (Gimp *gimp,
+ GFile *file,
+ GtkWidget *parent);
#endif /* __FILE_COMMANDS_H__ */
diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c
index 44bdaf0a60..a4018ee413 100644
--- a/app/actions/gradient-editor-commands.c
+++ b/app/actions/gradient-editor-commands.c
@@ -53,8 +53,8 @@ static void gradient_editor_replicate_response (GtkWidget *widge
/* public functions */
void
-gradient_editor_left_color_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_left_color_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
@@ -62,9 +62,9 @@ gradient_editor_left_color_cmd_callback (GtkAction *action,
}
void
-gradient_editor_left_color_type_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+gradient_editor_left_color_type_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -98,9 +98,9 @@ gradient_editor_left_color_type_cmd_callback (GtkAction *action,
}
void
-gradient_editor_load_left_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+gradient_editor_load_left_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpDataEditor *data_editor = GIMP_DATA_EDITOR (data);
@@ -155,9 +155,9 @@ gradient_editor_load_left_cmd_callback (GtkAction *action,
}
void
-gradient_editor_save_left_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+gradient_editor_save_left_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -170,8 +170,8 @@ gradient_editor_save_left_cmd_callback (GtkAction *action,
}
void
-gradient_editor_right_color_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_right_color_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
@@ -179,9 +179,9 @@ gradient_editor_right_color_cmd_callback (GtkAction *action,
}
void
-gradient_editor_right_color_type_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+gradient_editor_right_color_type_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -215,9 +215,9 @@ gradient_editor_right_color_type_cmd_callback (GtkAction *action,
}
void
-gradient_editor_load_right_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+gradient_editor_load_right_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpDataEditor *data_editor = GIMP_DATA_EDITOR (data);
@@ -272,9 +272,9 @@ gradient_editor_load_right_cmd_callback (GtkAction *action,
}
void
-gradient_editor_save_right_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+gradient_editor_save_right_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -287,9 +287,9 @@ gradient_editor_save_right_cmd_callback (GtkAction *action,
}
void
-gradient_editor_blending_func_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+gradient_editor_blending_func_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -315,9 +315,9 @@ gradient_editor_blending_func_cmd_callback (GtkAction *action,
}
void
-gradient_editor_coloring_type_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+gradient_editor_coloring_type_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -343,8 +343,8 @@ gradient_editor_coloring_type_cmd_callback (GtkAction *action,
}
void
-gradient_editor_flip_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_flip_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -361,8 +361,8 @@ gradient_editor_flip_cmd_callback (GtkAction *action,
}
void
-gradient_editor_replicate_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_replicate_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpDataEditor *data_editor = GIMP_DATA_EDITOR (data);
@@ -449,8 +449,8 @@ gradient_editor_replicate_cmd_callback (GtkAction *action,
}
void
-gradient_editor_split_midpoint_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_split_midpoint_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpDataEditor *data_editor = GIMP_DATA_EDITOR (data);
@@ -470,8 +470,8 @@ gradient_editor_split_midpoint_cmd_callback (GtkAction *action,
}
void
-gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_split_uniformly_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpDataEditor *data_editor = GIMP_DATA_EDITOR (data);
@@ -559,8 +559,8 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
}
void
-gradient_editor_delete_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_delete_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -577,8 +577,8 @@ gradient_editor_delete_cmd_callback (GtkAction *action,
}
void
-gradient_editor_recenter_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_recenter_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -591,8 +591,8 @@ gradient_editor_recenter_cmd_callback (GtkAction *action,
}
void
-gradient_editor_redistribute_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_redistribute_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -605,8 +605,8 @@ gradient_editor_redistribute_cmd_callback (GtkAction *action,
}
void
-gradient_editor_blend_color_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_blend_color_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -622,8 +622,8 @@ gradient_editor_blend_color_cmd_callback (GtkAction *action,
}
void
-gradient_editor_blend_opacity_cmd_callback (GtkAction *action,
- gpointer data)
+gradient_editor_blend_opacity_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
GimpGradient *gradient;
@@ -639,9 +639,9 @@ gradient_editor_blend_opacity_cmd_callback (GtkAction *action,
}
void
-gradient_editor_zoom_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+gradient_editor_zoom_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpGradientEditor *editor = GIMP_GRADIENT_EDITOR (data);
diff --git a/app/actions/gradient-editor-commands.h b/app/actions/gradient-editor-commands.h
index 906bbe5478..5f7c136694 100644
--- a/app/actions/gradient-editor-commands.h
+++ b/app/actions/gradient-editor-commands.h
@@ -29,60 +29,60 @@ enum
};
-void gradient_editor_left_color_cmd_callback (GtkAction *action,
- gpointer data);
-void gradient_editor_left_color_type_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void gradient_editor_load_left_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void gradient_editor_save_left_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void gradient_editor_left_color_cmd_callback (GimpAction *action,
+ gpointer data);
+void gradient_editor_left_color_type_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void gradient_editor_load_left_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void gradient_editor_save_left_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void gradient_editor_right_color_cmd_callback (GtkAction *action,
- gpointer data);
-void gradient_editor_right_color_type_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void gradient_editor_load_right_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void gradient_editor_save_right_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void gradient_editor_right_color_cmd_callback (GimpAction *action,
+ gpointer data);
+void gradient_editor_right_color_type_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void gradient_editor_load_right_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void gradient_editor_save_right_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void gradient_editor_blending_func_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void gradient_editor_coloring_type_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
+void gradient_editor_blending_func_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void gradient_editor_coloring_type_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
-void gradient_editor_flip_cmd_callback (GtkAction *action,
- gpointer data);
-void gradient_editor_replicate_cmd_callback (GtkAction *action,
- gpointer data);
-void gradient_editor_split_midpoint_cmd_callback (GtkAction *action,
- gpointer data);
-void gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
- gpointer data);
-void gradient_editor_delete_cmd_callback (GtkAction *action,
- gpointer data);
-void gradient_editor_recenter_cmd_callback (GtkAction *action,
- gpointer data);
-void gradient_editor_redistribute_cmd_callback (GtkAction *action,
- gpointer data);
+void gradient_editor_flip_cmd_callback (GimpAction *action,
+ gpointer data);
+void gradient_editor_replicate_cmd_callback (GimpAction *action,
+ gpointer data);
+void gradient_editor_split_midpoint_cmd_callback (GimpAction *action,
+ gpointer data);
+void gradient_editor_split_uniformly_cmd_callback (GimpAction *action,
+ gpointer data);
+void gradient_editor_delete_cmd_callback (GimpAction *action,
+ gpointer data);
+void gradient_editor_recenter_cmd_callback (GimpAction *action,
+ gpointer data);
+void gradient_editor_redistribute_cmd_callback (GimpAction *action,
+ gpointer data);
-void gradient_editor_blend_color_cmd_callback (GtkAction *action,
- gpointer data);
-void gradient_editor_blend_opacity_cmd_callback (GtkAction *action,
- gpointer data);
+void gradient_editor_blend_color_cmd_callback (GimpAction *action,
+ gpointer data);
+void gradient_editor_blend_opacity_cmd_callback (GimpAction *action,
+ gpointer data);
-void gradient_editor_zoom_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void gradient_editor_zoom_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
#endif /* __GRADIENT_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/gradients-commands.c b/app/actions/gradients-commands.c
index 4b47a3b6ba..f8fd06766e 100644
--- a/app/actions/gradients-commands.c
+++ b/app/actions/gradients-commands.c
@@ -49,8 +49,8 @@ static void gradients_save_as_pov_ray_response (GtkWidget *dialog,
/* public functions */
void
-gradients_save_as_pov_ray_cmd_callback (GtkAction *action,
- gpointer data)
+gradients_save_as_pov_ray_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
diff --git a/app/actions/gradients-commands.h b/app/actions/gradients-commands.h
index 063adead86..c8828ae6b2 100644
--- a/app/actions/gradients-commands.h
+++ b/app/actions/gradients-commands.h
@@ -19,8 +19,8 @@
#define __GRADIENTS_COMMANDS_H__
-void gradients_save_as_pov_ray_cmd_callback (GtkAction *action,
- gpointer data);
+void gradients_save_as_pov_ray_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __GRADIENTS_COMMANDS_H__ */
diff --git a/app/actions/help-commands.c b/app/actions/help-commands.c
index 1965df2efc..a693f2fe6c 100644
--- a/app/actions/help-commands.c
+++ b/app/actions/help-commands.c
@@ -33,8 +33,8 @@
void
-help_help_cmd_callback (GtkAction *action,
- gpointer data)
+help_help_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GimpDisplay *display;
@@ -45,8 +45,8 @@ help_help_cmd_callback (GtkAction *action,
}
void
-help_context_help_cmd_callback (GtkAction *action,
- gpointer data)
+help_context_help_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
diff --git a/app/actions/help-commands.h b/app/actions/help-commands.h
index c77a839d0f..c5c12e06db 100644
--- a/app/actions/help-commands.h
+++ b/app/actions/help-commands.h
@@ -19,10 +19,10 @@
#define __HELP_COMMANDS_H__
-void help_help_cmd_callback (GtkAction *action,
- gpointer data);
-void help_context_help_cmd_callback (GtkAction *action,
- gpointer data);
+void help_help_cmd_callback (GimpAction *action,
+ gpointer data);
+void help_context_help_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __HELP_COMMANDS_H__ */
diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c
index f8b0da8056..b2aad15f3b 100644
--- a/app/actions/image-commands.c
+++ b/app/actions/image-commands.c
@@ -183,8 +183,8 @@ static GimpPalette *image_convert_indexed_custom_palette = NULL;
/* public functions */
void
-image_new_cmd_callback (GtkAction *action,
- gpointer data)
+image_new_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWidget *widget;
GtkWidget *dialog;
@@ -207,8 +207,8 @@ image_new_cmd_callback (GtkAction *action,
}
void
-image_duplicate_cmd_callback (GtkAction *action,
- gpointer data)
+image_duplicate_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -230,9 +230,9 @@ image_duplicate_cmd_callback (GtkAction *action,
}
void
-image_convert_base_type_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+image_convert_base_type_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpImage *image;
GimpDisplay *display;
@@ -347,9 +347,9 @@ image_convert_base_type_cmd_callback (GtkAction *action,
}
void
-image_convert_precision_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+image_convert_precision_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpImage *image;
GimpDisplay *display;
@@ -398,9 +398,9 @@ image_convert_precision_cmd_callback (GtkAction *action,
}
void
-image_convert_gamma_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+image_convert_gamma_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpImage *image;
GimpDisplay *display;
@@ -427,8 +427,8 @@ image_convert_gamma_cmd_callback (GtkAction *action,
}
void
-image_color_management_enabled_cmd_callback (GtkAction *action,
- gpointer data)
+image_color_management_enabled_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
gboolean enabled;
@@ -444,8 +444,8 @@ image_color_management_enabled_cmd_callback (GtkAction *action,
}
void
-image_color_profile_assign_cmd_callback (GtkAction *action,
- gpointer data)
+image_color_profile_assign_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDisplay *display;
@@ -485,8 +485,8 @@ image_color_profile_assign_cmd_callback (GtkAction *action,
}
void
-image_color_profile_convert_cmd_callback (GtkAction *action,
- gpointer data)
+image_color_profile_convert_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDisplay *display;
@@ -528,8 +528,8 @@ image_color_profile_convert_cmd_callback (GtkAction *action,
}
void
-image_color_profile_discard_cmd_callback (GtkAction *action,
- gpointer data)
+image_color_profile_discard_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -573,8 +573,8 @@ image_profile_save_dialog_response (GtkWidget *dialog,
}
void
-image_color_profile_save_cmd_callback (GtkAction *action,
- gpointer data)
+image_color_profile_save_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDisplay *display;
@@ -622,8 +622,8 @@ image_color_profile_save_cmd_callback (GtkAction *action,
}
void
-image_resize_cmd_callback (GtkAction *action,
- gpointer data)
+image_resize_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -665,8 +665,8 @@ image_resize_cmd_callback (GtkAction *action,
}
void
-image_resize_to_layers_cmd_callback (GtkAction *action,
- gpointer data)
+image_resize_to_layers_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -689,8 +689,8 @@ image_resize_to_layers_cmd_callback (GtkAction *action,
}
void
-image_resize_to_selection_cmd_callback (GtkAction *action,
- gpointer data)
+image_resize_to_selection_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -713,8 +713,8 @@ image_resize_to_selection_cmd_callback (GtkAction *action,
}
void
-image_print_size_cmd_callback (GtkAction *action,
- gpointer data)
+image_print_size_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -748,8 +748,8 @@ image_print_size_cmd_callback (GtkAction *action,
}
void
-image_scale_cmd_callback (GtkAction *action,
- gpointer data)
+image_scale_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -787,9 +787,9 @@ image_scale_cmd_callback (GtkAction *action,
}
void
-image_flip_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+image_flip_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -811,9 +811,9 @@ image_flip_cmd_callback (GtkAction *action,
}
void
-image_rotate_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+image_rotate_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -835,8 +835,8 @@ image_rotate_cmd_callback (GtkAction *action,
}
void
-image_crop_to_selection_cmd_callback (GtkAction *action,
- gpointer data)
+image_crop_to_selection_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -862,8 +862,8 @@ image_crop_to_selection_cmd_callback (GtkAction *action,
}
void
-image_crop_to_content_cmd_callback (GtkAction *action,
- gpointer data)
+image_crop_to_content_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -901,8 +901,8 @@ image_crop_to_content_cmd_callback (GtkAction *action,
}
void
-image_merge_layers_cmd_callback (GtkAction *action,
- gpointer data)
+image_merge_layers_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWidget *dialog;
GimpImage *image;
@@ -936,8 +936,8 @@ image_merge_layers_cmd_callback (GtkAction *action,
}
void
-image_flatten_image_cmd_callback (GtkAction *action,
- gpointer data)
+image_flatten_image_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDisplay *display;
@@ -961,8 +961,8 @@ image_flatten_image_cmd_callback (GtkAction *action,
}
void
-image_configure_grid_cmd_callback (GtkAction *action,
- gpointer data)
+image_configure_grid_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -990,8 +990,8 @@ image_configure_grid_cmd_callback (GtkAction *action,
}
void
-image_properties_cmd_callback (GtkAction *action,
- gpointer data)
+image_properties_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
diff --git a/app/actions/image-commands.h b/app/actions/image-commands.h
index bed674d0d0..bc36f4d9e9 100644
--- a/app/actions/image-commands.h
+++ b/app/actions/image-commands.h
@@ -19,62 +19,62 @@
#define __IMAGE_COMMANDS_H__
-void image_new_cmd_callback (GtkAction *action,
- gpointer data);
-void image_duplicate_cmd_callback (GtkAction *action,
- gpointer data);
+void image_new_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_duplicate_cmd_callback (GimpAction *action,
+ gpointer data);
-void image_convert_base_type_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void image_convert_precision_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void image_convert_gamma_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
+void image_convert_base_type_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void image_convert_precision_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void image_convert_gamma_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
-void image_color_management_enabled_cmd_callback (GtkAction *action,
- gpointer data);
-void image_color_profile_assign_cmd_callback (GtkAction *action,
- gpointer data);
-void image_color_profile_convert_cmd_callback (GtkAction *action,
- gpointer data);
-void image_color_profile_discard_cmd_callback (GtkAction *action,
- gpointer data);
-void image_color_profile_save_cmd_callback (GtkAction *action,
- gpointer data);
+void image_color_management_enabled_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_color_profile_assign_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_color_profile_convert_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_color_profile_discard_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_color_profile_save_cmd_callback (GimpAction *action,
+ gpointer data);
-void image_resize_cmd_callback (GtkAction *action,
- gpointer data);
-void image_resize_to_layers_cmd_callback (GtkAction *action,
- gpointer data);
-void image_resize_to_selection_cmd_callback (GtkAction *action,
- gpointer data);
-void image_print_size_cmd_callback (GtkAction *action,
- gpointer data);
-void image_scale_cmd_callback (GtkAction *action,
- gpointer data);
-void image_flip_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void image_rotate_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void image_crop_to_selection_cmd_callback (GtkAction *action,
- gpointer data);
-void image_crop_to_content_cmd_callback (GtkAction *action,
- gpointer data);
+void image_resize_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_resize_to_layers_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_resize_to_selection_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_print_size_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_scale_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_flip_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void image_rotate_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void image_crop_to_selection_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_crop_to_content_cmd_callback (GimpAction *action,
+ gpointer data);
-void image_merge_layers_cmd_callback (GtkAction *action,
- gpointer data);
-void image_flatten_image_cmd_callback (GtkAction *action,
- gpointer data);
+void image_merge_layers_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_flatten_image_cmd_callback (GimpAction *action,
+ gpointer data);
-void image_configure_grid_cmd_callback (GtkAction *action,
- gpointer data);
-void image_properties_cmd_callback (GtkAction *action,
- gpointer data);
+void image_configure_grid_cmd_callback (GimpAction *action,
+ gpointer data);
+void image_properties_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __IMAGE_COMMANDS_H__ */
diff --git a/app/actions/images-commands.c b/app/actions/images-commands.c
index 2c2cc5106a..1455bd53f3 100644
--- a/app/actions/images-commands.c
+++ b/app/actions/images-commands.c
@@ -41,8 +41,8 @@
/* public functions */
void
-images_raise_views_cmd_callback (GtkAction *action,
- gpointer data)
+images_raise_views_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
@@ -71,8 +71,8 @@ images_raise_views_cmd_callback (GtkAction *action,
}
void
-images_new_view_cmd_callback (GtkAction *action,
- gpointer data)
+images_new_view_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
@@ -93,8 +93,8 @@ images_new_view_cmd_callback (GtkAction *action,
}
void
-images_delete_image_cmd_callback (GtkAction *action,
- gpointer data)
+images_delete_image_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
diff --git a/app/actions/images-commands.h b/app/actions/images-commands.h
index dbd3fe5333..43bcec9fb3 100644
--- a/app/actions/images-commands.h
+++ b/app/actions/images-commands.h
@@ -19,12 +19,12 @@
#define __IMAGES_COMMANDS_H__
-void images_raise_views_cmd_callback (GtkAction *action,
- gpointer data);
-void images_new_view_cmd_callback (GtkAction *action,
- gpointer data);
-void images_delete_image_cmd_callback (GtkAction *action,
- gpointer data);
+void images_raise_views_cmd_callback (GimpAction *action,
+ gpointer data);
+void images_new_view_cmd_callback (GimpAction *action,
+ gpointer data);
+void images_delete_image_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __IMAGES_COMMANDS_H__ */
diff --git a/app/actions/items-commands.c b/app/actions/items-commands.c
index 678de49700..2afd3918d8 100644
--- a/app/actions/items-commands.c
+++ b/app/actions/items-commands.c
@@ -64,9 +64,9 @@ static void items_stroke_callback (GtkWidget *dialog,
/* public functions */
void
-items_visible_cmd_callback (GtkAction *action,
- GimpImage *image,
- GimpItem *item)
+items_visible_cmd_callback (GimpAction *action,
+ GimpImage *image,
+ GimpItem *item)
{
gboolean visible;
@@ -89,9 +89,9 @@ items_visible_cmd_callback (GtkAction *action,
}
void
-items_linked_cmd_callback (GtkAction *action,
- GimpImage *image,
- GimpItem *item)
+items_linked_cmd_callback (GimpAction *action,
+ GimpImage *image,
+ GimpItem *item)
{
gboolean linked;
@@ -114,9 +114,9 @@ items_linked_cmd_callback (GtkAction *action,
}
void
-items_lock_content_cmd_callback (GtkAction *action,
- GimpImage *image,
- GimpItem *item)
+items_lock_content_cmd_callback (GimpAction *action,
+ GimpImage *image,
+ GimpItem *item)
{
gboolean locked;
@@ -139,9 +139,9 @@ items_lock_content_cmd_callback (GtkAction *action,
}
void
-items_lock_position_cmd_callback (GtkAction *action,
- GimpImage *image,
- GimpItem *item)
+items_lock_position_cmd_callback (GimpAction *action,
+ GimpImage *image,
+ GimpItem *item)
{
gboolean locked;
@@ -165,7 +165,7 @@ items_lock_position_cmd_callback (GtkAction *action,
}
void
-items_color_tag_cmd_callback (GtkAction *action,
+items_color_tag_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item,
GimpColorTag color_tag)
@@ -187,7 +187,7 @@ items_color_tag_cmd_callback (GtkAction *action,
}
void
-items_fill_cmd_callback (GtkAction *action,
+items_fill_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item,
const gchar *dialog_key,
@@ -235,10 +235,10 @@ items_fill_cmd_callback (GtkAction *action,
}
void
-items_fill_last_vals_cmd_callback (GtkAction *action,
- GimpImage *image,
- GimpItem *item,
- gpointer data)
+items_fill_last_vals_cmd_callback (GimpAction *action,
+ GimpImage *image,
+ GimpItem *item,
+ gpointer data)
{
GimpDrawable *drawable;
GimpDialogConfig *config;
@@ -272,7 +272,7 @@ items_fill_last_vals_cmd_callback (GtkAction *action,
}
void
-items_stroke_cmd_callback (GtkAction *action,
+items_stroke_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item,
const gchar *dialog_key,
@@ -320,10 +320,10 @@ items_stroke_cmd_callback (GtkAction *action,
}
void
-items_stroke_last_vals_cmd_callback (GtkAction *action,
- GimpImage *image,
- GimpItem *item,
- gpointer data)
+items_stroke_last_vals_cmd_callback (GimpAction *action,
+ GimpImage *image,
+ GimpItem *item,
+ gpointer data)
{
GimpDrawable *drawable;
GimpDialogConfig *config;
diff --git a/app/actions/items-commands.h b/app/actions/items-commands.h
index cedbb28ce1..cbdb044eb1 100644
--- a/app/actions/items-commands.h
+++ b/app/actions/items-commands.h
@@ -19,25 +19,25 @@
#define __ITEMS_COMMANDS_H__
-void items_visible_cmd_callback (GtkAction *action,
+void items_visible_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item);
-void items_linked_cmd_callback (GtkAction *action,
+void items_linked_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item);
-void items_lock_content_cmd_callback (GtkAction *action,
+void items_lock_content_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item);
-void items_lock_position_cmd_callback (GtkAction *action,
+void items_lock_position_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item);
-void items_color_tag_cmd_callback (GtkAction *action,
+void items_color_tag_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item,
GimpColorTag color_tag);
-void items_fill_cmd_callback (GtkAction *action,
+void items_fill_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item,
const gchar *dialog_key,
@@ -45,12 +45,12 @@ void items_fill_cmd_callback (GtkAction *action,
const gchar *dialog_icon_name,
const gchar *dialog_help_id,
gpointer data);
-void items_fill_last_vals_cmd_callback (GtkAction *action,
+void items_fill_last_vals_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item,
gpointer data);
-void items_stroke_cmd_callback (GtkAction *action,
+void items_stroke_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item,
const gchar *dialog_key,
@@ -58,7 +58,7 @@ void items_stroke_cmd_callback (GtkAction *action,
const gchar *dialog_icon_name,
const gchar *dialog_help_id,
gpointer data);
-void items_stroke_last_vals_cmd_callback (GtkAction *action,
+void items_stroke_last_vals_cmd_callback (GimpAction *action,
GimpImage *image,
GimpItem *item,
gpointer data);
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index 2425cd24f6..c17e2892f9 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -180,8 +180,8 @@ static GimpInterpolationType layer_scale_interp = -1;
/* public functions */
void
-layers_edit_cmd_callback (GtkAction *action,
- gpointer data)
+layers_edit_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -200,8 +200,8 @@ layers_edit_cmd_callback (GtkAction *action,
}
void
-layers_edit_text_cmd_callback (GtkAction *action,
- gpointer data)
+layers_edit_text_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -239,8 +239,8 @@ layers_edit_text_cmd_callback (GtkAction *action,
}
void
-layers_edit_attributes_cmd_callback (GtkAction *action,
- gpointer data)
+layers_edit_attributes_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -289,8 +289,8 @@ layers_edit_attributes_cmd_callback (GtkAction *action,
}
void
-layers_new_cmd_callback (GtkAction *action,
- gpointer data)
+layers_new_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -365,8 +365,8 @@ layers_new_cmd_callback (GtkAction *action,
}
void
-layers_new_last_vals_cmd_callback (GtkAction *action,
- gpointer data)
+layers_new_last_vals_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -419,8 +419,8 @@ layers_new_last_vals_cmd_callback (GtkAction *action,
}
void
-layers_new_from_visible_cmd_callback (GtkAction *action,
- gpointer data)
+layers_new_from_visible_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -448,8 +448,8 @@ layers_new_from_visible_cmd_callback (GtkAction *action,
}
void
-layers_new_group_cmd_callback (GtkAction *action,
- gpointer data)
+layers_new_group_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -462,9 +462,9 @@ layers_new_group_cmd_callback (GtkAction *action,
}
void
-layers_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+layers_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -491,8 +491,8 @@ layers_select_cmd_callback (GtkAction *action,
}
void
-layers_raise_cmd_callback (GtkAction *action,
- gpointer data)
+layers_raise_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -503,8 +503,8 @@ layers_raise_cmd_callback (GtkAction *action,
}
void
-layers_raise_to_top_cmd_callback (GtkAction *action,
- gpointer data)
+layers_raise_to_top_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -515,8 +515,8 @@ layers_raise_to_top_cmd_callback (GtkAction *action,
}
void
-layers_lower_cmd_callback (GtkAction *action,
- gpointer data)
+layers_lower_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -527,8 +527,8 @@ layers_lower_cmd_callback (GtkAction *action,
}
void
-layers_lower_to_bottom_cmd_callback (GtkAction *action,
- gpointer data)
+layers_lower_to_bottom_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -539,8 +539,8 @@ layers_lower_to_bottom_cmd_callback (GtkAction *action,
}
void
-layers_duplicate_cmd_callback (GtkAction *action,
- gpointer data)
+layers_duplicate_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -561,8 +561,8 @@ layers_duplicate_cmd_callback (GtkAction *action,
}
void
-layers_anchor_cmd_callback (GtkAction *action,
- gpointer data)
+layers_anchor_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -576,8 +576,8 @@ layers_anchor_cmd_callback (GtkAction *action,
}
void
-layers_merge_down_cmd_callback (GtkAction *action,
- gpointer data)
+layers_merge_down_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -592,8 +592,8 @@ layers_merge_down_cmd_callback (GtkAction *action,
}
void
-layers_merge_group_cmd_callback (GtkAction *action,
- gpointer data)
+layers_merge_group_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -604,8 +604,8 @@ layers_merge_group_cmd_callback (GtkAction *action,
}
void
-layers_delete_cmd_callback (GtkAction *action,
- gpointer data)
+layers_delete_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -616,8 +616,8 @@ layers_delete_cmd_callback (GtkAction *action,
}
void
-layers_text_discard_cmd_callback (GtkAction *action,
- gpointer data)
+layers_text_discard_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -628,8 +628,8 @@ layers_text_discard_cmd_callback (GtkAction *action,
}
void
-layers_text_to_vectors_cmd_callback (GtkAction *action,
- gpointer data)
+layers_text_to_vectors_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -652,8 +652,8 @@ layers_text_to_vectors_cmd_callback (GtkAction *action,
}
void
-layers_text_along_vectors_cmd_callback (GtkAction *action,
- gpointer data)
+layers_text_along_vectors_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -709,8 +709,8 @@ layers_text_along_vectors_cmd_callback (GtkAction *action,
}
void
-layers_resize_cmd_callback (GtkAction *action,
- gpointer data)
+layers_resize_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -755,8 +755,8 @@ layers_resize_cmd_callback (GtkAction *action,
}
void
-layers_resize_to_image_cmd_callback (GtkAction *action,
- gpointer data)
+layers_resize_to_image_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -769,8 +769,8 @@ layers_resize_to_image_cmd_callback (GtkAction *action,
}
void
-layers_scale_cmd_callback (GtkAction *action,
- gpointer data)
+layers_scale_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -813,8 +813,8 @@ layers_scale_cmd_callback (GtkAction *action,
}
void
-layers_crop_to_selection_cmd_callback (GtkAction *action,
- gpointer data)
+layers_crop_to_selection_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -851,8 +851,8 @@ layers_crop_to_selection_cmd_callback (GtkAction *action,
}
void
-layers_crop_to_content_cmd_callback (GtkAction *action,
- gpointer data)
+layers_crop_to_content_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -897,8 +897,8 @@ layers_crop_to_content_cmd_callback (GtkAction *action,
}
void
-layers_mask_add_cmd_callback (GtkAction *action,
- gpointer data)
+layers_mask_add_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -932,8 +932,8 @@ layers_mask_add_cmd_callback (GtkAction *action,
}
void
-layers_mask_add_last_vals_cmd_callback (GtkAction *action,
- gpointer data)
+layers_mask_add_last_vals_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -979,9 +979,9 @@ layers_mask_add_last_vals_cmd_callback (GtkAction *action,
}
void
-layers_mask_apply_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+layers_mask_apply_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -997,8 +997,8 @@ layers_mask_apply_cmd_callback (GtkAction *action,
}
void
-layers_mask_edit_cmd_callback (GtkAction *action,
- gpointer data)
+layers_mask_edit_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1016,8 +1016,8 @@ layers_mask_edit_cmd_callback (GtkAction *action,
}
void
-layers_mask_show_cmd_callback (GtkAction *action,
- gpointer data)
+layers_mask_show_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1035,8 +1035,8 @@ layers_mask_show_cmd_callback (GtkAction *action,
}
void
-layers_mask_disable_cmd_callback (GtkAction *action,
- gpointer data)
+layers_mask_disable_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1054,9 +1054,9 @@ layers_mask_disable_cmd_callback (GtkAction *action,
}
void
-layers_mask_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+layers_mask_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1075,8 +1075,8 @@ layers_mask_to_selection_cmd_callback (GtkAction *action,
}
void
-layers_alpha_add_cmd_callback (GtkAction *action,
- gpointer data)
+layers_alpha_add_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1090,8 +1090,8 @@ layers_alpha_add_cmd_callback (GtkAction *action,
}
void
-layers_alpha_remove_cmd_callback (GtkAction *action,
- gpointer data)
+layers_alpha_remove_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1105,9 +1105,9 @@ layers_alpha_remove_cmd_callback (GtkAction *action,
}
void
-layers_alpha_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+layers_alpha_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1120,9 +1120,9 @@ layers_alpha_to_selection_cmd_callback (GtkAction *action,
}
void
-layers_opacity_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+layers_opacity_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1146,9 +1146,9 @@ layers_opacity_cmd_callback (GtkAction *action,
}
void
-layers_mode_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+layers_mode_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1183,9 +1183,9 @@ layers_mode_cmd_callback (GtkAction *action,
}
void
-layers_blend_space_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+layers_blend_space_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1211,9 +1211,9 @@ layers_blend_space_cmd_callback (GtkAction *action,
}
void
-layers_composite_space_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+layers_composite_space_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1239,9 +1239,9 @@ layers_composite_space_cmd_callback (GtkAction *action,
}
void
-layers_composite_mode_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+layers_composite_mode_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1267,7 +1267,7 @@ layers_composite_mode_cmd_callback (GtkAction *action,
}
void
-layers_visible_cmd_callback (GtkAction *action,
+layers_visible_cmd_callback (GimpAction *action,
gpointer data)
{
GimpImage *image;
@@ -1278,8 +1278,8 @@ layers_visible_cmd_callback (GtkAction *action,
}
void
-layers_linked_cmd_callback (GtkAction *action,
- gpointer data)
+layers_linked_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1289,8 +1289,8 @@ layers_linked_cmd_callback (GtkAction *action,
}
void
-layers_lock_content_cmd_callback (GtkAction *action,
- gpointer data)
+layers_lock_content_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1300,8 +1300,8 @@ layers_lock_content_cmd_callback (GtkAction *action,
}
void
-layers_lock_position_cmd_callback (GtkAction *action,
- gpointer data)
+layers_lock_position_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1311,8 +1311,8 @@ layers_lock_position_cmd_callback (GtkAction *action,
}
void
-layers_lock_alpha_cmd_callback (GtkAction *action,
- gpointer data)
+layers_lock_alpha_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
@@ -1338,9 +1338,9 @@ layers_lock_alpha_cmd_callback (GtkAction *action,
}
void
-layers_color_tag_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+layers_color_tag_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpLayer *layer;
diff --git a/app/actions/layers-commands.h b/app/actions/layers-commands.h
index d9c5688982..bb115a6df3 100644
--- a/app/actions/layers-commands.h
+++ b/app/actions/layers-commands.h
@@ -19,119 +19,119 @@
#define __LAYERS_COMMANDS_H__
-void layers_edit_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_edit_text_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_edit_attributes_cmd_callback (GtkAction *action,
- gpointer data);
-
-void layers_new_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_new_last_vals_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_new_from_visible_cmd_callback (GtkAction *action,
- gpointer data);
-
-void layers_new_group_cmd_callback (GtkAction *action,
- gpointer data);
-
-void layers_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void layers_raise_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_raise_to_top_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_lower_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_lower_to_bottom_cmd_callback (GtkAction *action,
- gpointer data);
-
-void layers_duplicate_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_anchor_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_merge_down_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_merge_group_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_delete_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_text_discard_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_text_to_vectors_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_text_along_vectors_cmd_callback (GtkAction *action,
- gpointer data);
-
-void layers_resize_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_resize_to_image_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_scale_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_crop_to_selection_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_crop_to_content_cmd_callback (GtkAction *action,
- gpointer data);
-
-void layers_mask_add_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_mask_add_last_vals_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_mask_apply_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void layers_mask_edit_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_mask_show_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_mask_disable_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_mask_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void layers_alpha_add_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_alpha_remove_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_alpha_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-
-void layers_opacity_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void layers_mode_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void layers_blend_space_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void layers_composite_space_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void layers_composite_mode_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-
-void layers_visible_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_linked_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_lock_content_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_lock_position_cmd_callback (GtkAction *action,
- gpointer data);
-void layers_lock_alpha_cmd_callback (GtkAction *action,
- gpointer data);
-
-void layers_color_tag_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void layers_edit_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_edit_text_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_edit_attributes_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void layers_new_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_new_last_vals_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_new_from_visible_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void layers_new_group_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void layers_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void layers_raise_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_raise_to_top_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_lower_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_lower_to_bottom_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void layers_duplicate_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_anchor_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_merge_down_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_merge_group_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_delete_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_text_discard_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_text_to_vectors_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_text_along_vectors_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void layers_resize_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_resize_to_image_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_scale_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_crop_to_selection_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_crop_to_content_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void layers_mask_add_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_mask_add_last_vals_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_mask_apply_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void layers_mask_edit_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_mask_show_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_mask_disable_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_mask_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void layers_alpha_add_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_alpha_remove_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_alpha_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+
+void layers_opacity_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void layers_mode_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void layers_blend_space_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void layers_composite_space_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void layers_composite_mode_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+
+void layers_visible_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_linked_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_lock_content_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_lock_position_cmd_callback (GimpAction *action,
+ gpointer data);
+void layers_lock_alpha_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void layers_color_tag_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
#endif /* __LAYERS_COMMANDS_H__ */
diff --git a/app/actions/palette-editor-commands.c b/app/actions/palette-editor-commands.c
index f0d6cde90b..61c7a3eb4d 100644
--- a/app/actions/palette-editor-commands.c
+++ b/app/actions/palette-editor-commands.c
@@ -34,8 +34,8 @@
/* public functions */
void
-palette_editor_edit_color_cmd_callback (GtkAction *action,
- gpointer data)
+palette_editor_edit_color_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
@@ -43,9 +43,9 @@ palette_editor_edit_color_cmd_callback (GtkAction *action,
}
void
-palette_editor_new_color_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+palette_editor_new_color_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpDataEditor *data_editor = GIMP_DATA_EDITOR (data);
@@ -67,8 +67,8 @@ palette_editor_new_color_cmd_callback (GtkAction *action,
}
void
-palette_editor_delete_color_cmd_callback (GtkAction *action,
- gpointer data)
+palette_editor_delete_color_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpDataEditor *data_editor = GIMP_DATA_EDITOR (data);
@@ -82,9 +82,9 @@ palette_editor_delete_color_cmd_callback (GtkAction *action,
}
void
-palette_editor_zoom_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+palette_editor_zoom_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
diff --git a/app/actions/palette-editor-commands.h b/app/actions/palette-editor-commands.h
index b87425e076..b6d70303e0 100644
--- a/app/actions/palette-editor-commands.h
+++ b/app/actions/palette-editor-commands.h
@@ -19,17 +19,17 @@
#define __PALETTE_EDITOR_COMMANDS_H__
-void palette_editor_edit_color_cmd_callback (GtkAction *action,
- gpointer data);
-void palette_editor_new_color_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void palette_editor_delete_color_cmd_callback (GtkAction *action,
- gpointer data);
+void palette_editor_edit_color_cmd_callback (GimpAction *action,
+ gpointer data);
+void palette_editor_new_color_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void palette_editor_delete_color_cmd_callback (GimpAction *action,
+ gpointer data);
-void palette_editor_zoom_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void palette_editor_zoom_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
#endif /* __PALETTE_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/palettes-commands.c b/app/actions/palettes-commands.c
index 9b98f59d14..4512dd18e1 100644
--- a/app/actions/palettes-commands.c
+++ b/app/actions/palettes-commands.c
@@ -54,8 +54,8 @@ static void palettes_merge_callback (GtkWidget *widget,
/* public functions */
void
-palettes_import_cmd_callback (GtkAction *action,
- gpointer data)
+palettes_import_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
@@ -68,8 +68,8 @@ palettes_import_cmd_callback (GtkAction *action,
}
void
-palettes_merge_cmd_callback (GtkAction *action,
- gpointer data)
+palettes_merge_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GtkWidget *dialog;
diff --git a/app/actions/palettes-commands.h b/app/actions/palettes-commands.h
index 49c27f8ec5..becec9056f 100644
--- a/app/actions/palettes-commands.h
+++ b/app/actions/palettes-commands.h
@@ -19,10 +19,10 @@
#define __PALETTES_COMMANDS_H__
-void palettes_import_cmd_callback (GtkAction *action,
- gpointer data);
-void palettes_merge_cmd_callback (GtkAction *action,
- gpointer data);
+void palettes_import_cmd_callback (GimpAction *action,
+ gpointer data);
+void palettes_merge_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __PALETTES_COMMANDS_H__ */
diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c
index e5900a750c..25df1fa3f3 100644
--- a/app/actions/plug-in-commands.c
+++ b/app/actions/plug-in-commands.c
@@ -67,7 +67,7 @@ static void plug_in_reset_all_response (GtkWidget *dialog,
/* public functions */
void
-plug_in_run_cmd_callback (GtkAction *action,
+plug_in_run_cmd_callback (GimpAction *action,
GimpProcedure *procedure,
gpointer data)
{
@@ -157,8 +157,8 @@ plug_in_run_cmd_callback (GtkAction *action,
}
void
-plug_in_reset_all_cmd_callback (GtkAction *action,
- gpointer data)
+plug_in_reset_all_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GtkWidget *dialog;
diff --git a/app/actions/plug-in-commands.h b/app/actions/plug-in-commands.h
index f80ed5db1c..a0bfa216c4 100644
--- a/app/actions/plug-in-commands.h
+++ b/app/actions/plug-in-commands.h
@@ -19,11 +19,11 @@
#define __PLUG_IN_COMMANDS_H__
-void plug_in_run_cmd_callback (GtkAction *action,
+void plug_in_run_cmd_callback (GimpAction *action,
GimpProcedure *proc,
gpointer data);
-void plug_in_reset_all_cmd_callback (GtkAction *action,
+void plug_in_reset_all_cmd_callback (GimpAction *action,
gpointer data);
diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c
index 8f9d282199..42bff73938 100644
--- a/app/actions/quick-mask-commands.c
+++ b/app/actions/quick-mask-commands.c
@@ -67,8 +67,8 @@ static void quick_mask_configure_callback (GtkWidget *dialog,
/* public functions */
void
-quick_mask_toggle_cmd_callback (GtkAction *action,
- gpointer data)
+quick_mask_toggle_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
gboolean active;
@@ -84,9 +84,9 @@ quick_mask_toggle_cmd_callback (GtkAction *action,
}
void
-quick_mask_invert_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+quick_mask_invert_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpImage *image;
gint value;
@@ -102,8 +102,8 @@ quick_mask_invert_cmd_callback (GtkAction *action,
}
void
-quick_mask_configure_cmd_callback (GtkAction *action,
- gpointer data)
+quick_mask_configure_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
diff --git a/app/actions/quick-mask-commands.h b/app/actions/quick-mask-commands.h
index a43192e160..18756061c2 100644
--- a/app/actions/quick-mask-commands.h
+++ b/app/actions/quick-mask-commands.h
@@ -19,13 +19,13 @@
#define __QUICK_MASK_COMMANDS_H__
-void quick_mask_toggle_cmd_callback (GtkAction *action,
- gpointer data);
-void quick_mask_invert_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void quick_mask_configure_cmd_callback (GtkAction *action,
- gpointer data);
+void quick_mask_toggle_cmd_callback (GimpAction *action,
+ gpointer data);
+void quick_mask_invert_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void quick_mask_configure_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __QUICK_MASK_COMMANDS_H__ */
diff --git a/app/actions/sample-points-commands.c b/app/actions/sample-points-commands.c
index d8c1822a74..be336fe914 100644
--- a/app/actions/sample-points-commands.c
+++ b/app/actions/sample-points-commands.c
@@ -31,8 +31,8 @@
/* public functions */
void
-sample_points_sample_merged_cmd_callback (GtkAction *action,
- gpointer data)
+sample_points_sample_merged_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpSamplePointEditor *editor = GIMP_SAMPLE_POINT_EDITOR (data);
gboolean active;
diff --git a/app/actions/sample-points-commands.h b/app/actions/sample-points-commands.h
index d7928cf87c..d7ac7cc06f 100644
--- a/app/actions/sample-points-commands.h
+++ b/app/actions/sample-points-commands.h
@@ -19,8 +19,8 @@
#define __SAMPLE_POINTS_COMMANDS_H__
-void sample_points_sample_merged_cmd_callback (GtkAction *action,
- gpointer data);
+void sample_points_sample_merged_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __SAMPLE_POINTS_COMMANDS_H__ */
diff --git a/app/actions/select-commands.c b/app/actions/select-commands.c
index 8443b80de3..f94cd75261 100644
--- a/app/actions/select-commands.c
+++ b/app/actions/select-commands.c
@@ -72,8 +72,8 @@ static void select_shrink_callback (GtkWidget *widget,
/* public functions */
void
-select_all_cmd_callback (GtkAction *action,
- gpointer data)
+select_all_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -83,8 +83,8 @@ select_all_cmd_callback (GtkAction *action,
}
void
-select_none_cmd_callback (GtkAction *action,
- gpointer data)
+select_none_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -94,8 +94,8 @@ select_none_cmd_callback (GtkAction *action,
}
void
-select_invert_cmd_callback (GtkAction *action,
- gpointer data)
+select_invert_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -105,8 +105,8 @@ select_invert_cmd_callback (GtkAction *action,
}
void
-select_float_cmd_callback (GtkAction *action,
- gpointer data)
+select_float_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -131,8 +131,8 @@ select_float_cmd_callback (GtkAction *action,
}
void
-select_feather_cmd_callback (GtkAction *action,
- gpointer data)
+select_feather_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -186,8 +186,8 @@ select_feather_cmd_callback (GtkAction *action,
}
void
-select_sharpen_cmd_callback (GtkAction *action,
- gpointer data)
+select_sharpen_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -197,8 +197,8 @@ select_sharpen_cmd_callback (GtkAction *action,
}
void
-select_shrink_cmd_callback (GtkAction *action,
- gpointer data)
+select_shrink_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -260,8 +260,8 @@ select_shrink_cmd_callback (GtkAction *action,
}
void
-select_grow_cmd_callback (GtkAction *action,
- gpointer data)
+select_grow_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -309,8 +309,8 @@ select_grow_cmd_callback (GtkAction *action,
}
void
-select_border_cmd_callback (GtkAction *action,
- gpointer data)
+select_border_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -386,8 +386,8 @@ select_border_cmd_callback (GtkAction *action,
}
void
-select_flood_cmd_callback (GtkAction *action,
- gpointer data)
+select_flood_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -397,8 +397,8 @@ select_flood_cmd_callback (GtkAction *action,
}
void
-select_save_cmd_callback (GtkAction *action,
- gpointer data)
+select_save_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpChannel *channel;
@@ -425,8 +425,8 @@ select_save_cmd_callback (GtkAction *action,
}
void
-select_fill_cmd_callback (GtkAction *action,
- gpointer data)
+select_fill_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -441,8 +441,8 @@ select_fill_cmd_callback (GtkAction *action,
}
void
-select_fill_last_vals_cmd_callback (GtkAction *action,
- gpointer data)
+select_fill_last_vals_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -454,8 +454,8 @@ select_fill_last_vals_cmd_callback (GtkAction *action,
}
void
-select_stroke_cmd_callback (GtkAction *action,
- gpointer data)
+select_stroke_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
@@ -470,8 +470,8 @@ select_stroke_cmd_callback (GtkAction *action,
}
void
-select_stroke_last_vals_cmd_callback (GtkAction *action,
- gpointer data)
+select_stroke_last_vals_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
return_if_no_image (image, data);
diff --git a/app/actions/select-commands.h b/app/actions/select-commands.h
index 91e5ec499d..7748a2444e 100644
--- a/app/actions/select-commands.h
+++ b/app/actions/select-commands.h
@@ -19,37 +19,37 @@
#define __SELECT_COMMANDS_H__
-void select_all_cmd_callback (GtkAction *action,
- gpointer data);
-void select_none_cmd_callback (GtkAction *action,
- gpointer data);
-void select_invert_cmd_callback (GtkAction *action,
- gpointer data);
-void select_float_cmd_callback (GtkAction *action,
- gpointer data);
-void select_feather_cmd_callback (GtkAction *action,
- gpointer data);
-void select_sharpen_cmd_callback (GtkAction *action,
- gpointer data);
-void select_shrink_cmd_callback (GtkAction *action,
- gpointer data);
-void select_grow_cmd_callback (GtkAction *action,
- gpointer data);
-void select_border_cmd_callback (GtkAction *action,
- gpointer data);
-void select_flood_cmd_callback (GtkAction *action,
- gpointer data);
-void select_save_cmd_callback (GtkAction *action,
- gpointer data);
+void select_all_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_none_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_invert_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_float_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_feather_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_sharpen_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_shrink_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_grow_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_border_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_flood_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_save_cmd_callback (GimpAction *action,
+ gpointer data);
-void select_fill_cmd_callback (GtkAction *action,
- gpointer data);
-void select_fill_last_vals_cmd_callback (GtkAction *action,
- gpointer data);
-void select_stroke_cmd_callback (GtkAction *action,
- gpointer data);
-void select_stroke_last_vals_cmd_callback (GtkAction *action,
- gpointer data);
+void select_fill_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_fill_last_vals_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_stroke_cmd_callback (GimpAction *action,
+ gpointer data);
+void select_stroke_last_vals_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __SELECT_COMMANDS_H__ */
diff --git a/app/actions/templates-commands.c b/app/actions/templates-commands.c
index 960b527372..f0bcea9c7c 100644
--- a/app/actions/templates-commands.c
+++ b/app/actions/templates-commands.c
@@ -80,8 +80,8 @@ static void templates_delete_data_free (TemplateDeleteData *delete_data);
/* public functions */
void
-templates_create_image_cmd_callback (GtkAction *action,
- gpointer data)
+templates_create_image_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
@@ -111,8 +111,8 @@ templates_create_image_cmd_callback (GtkAction *action,
}
void
-templates_new_cmd_callback (GtkAction *action,
- gpointer data)
+templates_new_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
@@ -143,8 +143,8 @@ templates_new_cmd_callback (GtkAction *action,
}
void
-templates_duplicate_cmd_callback (GtkAction *action,
- gpointer data)
+templates_duplicate_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
@@ -173,8 +173,8 @@ templates_duplicate_cmd_callback (GtkAction *action,
}
void
-templates_edit_cmd_callback (GtkAction *action,
- gpointer data)
+templates_edit_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
@@ -214,8 +214,8 @@ templates_edit_cmd_callback (GtkAction *action,
}
void
-templates_delete_cmd_callback (GtkAction *action,
- gpointer data)
+templates_delete_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container;
diff --git a/app/actions/templates-commands.h b/app/actions/templates-commands.h
index 2c57a12636..4107cc6a24 100644
--- a/app/actions/templates-commands.h
+++ b/app/actions/templates-commands.h
@@ -19,16 +19,16 @@
#define __TEMPLATES_COMMANDS_H__
-void templates_create_image_cmd_callback (GtkAction *action,
- gpointer data);
-void templates_new_cmd_callback (GtkAction *action,
- gpointer data);
-void templates_duplicate_cmd_callback (GtkAction *action,
- gpointer data);
-void templates_edit_cmd_callback (GtkAction *action,
- gpointer data);
-void templates_delete_cmd_callback (GtkAction *action,
- gpointer data);
+void templates_create_image_cmd_callback (GimpAction *action,
+ gpointer data);
+void templates_new_cmd_callback (GimpAction *action,
+ gpointer data);
+void templates_duplicate_cmd_callback (GimpAction *action,
+ gpointer data);
+void templates_edit_cmd_callback (GimpAction *action,
+ gpointer data);
+void templates_delete_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __TEMPLATES_COMMANDS_H__ */
diff --git a/app/actions/text-editor-commands.c b/app/actions/text-editor-commands.c
index d207fd70ad..ef190db994 100644
--- a/app/actions/text-editor-commands.c
+++ b/app/actions/text-editor-commands.c
@@ -48,8 +48,8 @@ static void text_editor_load_response (GtkWidget *dialog,
/* public functions */
void
-text_editor_load_cmd_callback (GtkAction *action,
- gpointer data)
+text_editor_load_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextEditor *editor = GIMP_TEXT_EDITOR (data);
@@ -92,8 +92,8 @@ text_editor_load_cmd_callback (GtkAction *action,
}
void
-text_editor_clear_cmd_callback (GtkAction *action,
- gpointer data)
+text_editor_clear_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextEditor *editor = GIMP_TEXT_EDITOR (data);
GtkTextBuffer *buffer;
@@ -104,9 +104,9 @@ text_editor_clear_cmd_callback (GtkAction *action,
}
void
-text_editor_direction_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+text_editor_direction_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpTextEditor *editor = GIMP_TEXT_EDITOR (data);
gint value;
diff --git a/app/actions/text-editor-commands.h b/app/actions/text-editor-commands.h
index 58db281877..83a5c1892f 100644
--- a/app/actions/text-editor-commands.h
+++ b/app/actions/text-editor-commands.h
@@ -19,13 +19,13 @@
#define __TEXT_EDITOR_COMMANDS_H__
-void text_editor_load_cmd_callback (GtkAction *action,
- gpointer data);
-void text_editor_clear_cmd_callback (GtkAction *action,
- gpointer data);
-void text_editor_direction_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
+void text_editor_load_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_editor_clear_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_editor_direction_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
#endif /* __TEXT_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/text-tool-commands.c b/app/actions/text-tool-commands.c
index a1b396a482..536e66ad5f 100644
--- a/app/actions/text-tool-commands.c
+++ b/app/actions/text-tool-commands.c
@@ -55,8 +55,8 @@ static void text_tool_load_dialog_response (GtkWidget *dialog,
/* public functions */
void
-text_tool_cut_cmd_callback (GtkAction *action,
- gpointer data)
+text_tool_cut_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
@@ -64,8 +64,8 @@ text_tool_cut_cmd_callback (GtkAction *action,
}
void
-text_tool_copy_cmd_callback (GtkAction *action,
- gpointer data)
+text_tool_copy_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
@@ -73,8 +73,8 @@ text_tool_copy_cmd_callback (GtkAction *action,
}
void
-text_tool_paste_cmd_callback (GtkAction *action,
- gpointer data)
+text_tool_paste_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
@@ -82,8 +82,8 @@ text_tool_paste_cmd_callback (GtkAction *action,
}
void
-text_tool_delete_cmd_callback (GtkAction *action,
- gpointer data)
+text_tool_delete_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
@@ -91,8 +91,8 @@ text_tool_delete_cmd_callback (GtkAction *action,
}
void
-text_tool_load_cmd_callback (GtkAction *action,
- gpointer data)
+text_tool_load_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
GtkWidget *dialog;
@@ -145,8 +145,8 @@ text_tool_load_cmd_callback (GtkAction *action,
}
void
-text_tool_clear_cmd_callback (GtkAction *action,
- gpointer data)
+text_tool_clear_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
GtkTextBuffer *buffer = GTK_TEXT_BUFFER (text_tool->buffer);
@@ -158,8 +158,8 @@ text_tool_clear_cmd_callback (GtkAction *action,
}
void
-text_tool_text_to_path_cmd_callback (GtkAction *action,
- gpointer data)
+text_tool_text_to_path_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
@@ -167,8 +167,8 @@ text_tool_text_to_path_cmd_callback (GtkAction *action,
}
void
-text_tool_text_along_path_cmd_callback (GtkAction *action,
- gpointer data)
+text_tool_text_along_path_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
@@ -176,9 +176,9 @@ text_tool_text_along_path_cmd_callback (GtkAction *action,
}
void
-text_tool_direction_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+text_tool_direction_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpTextTool *text_tool = GIMP_TEXT_TOOL (data);
gint value;
diff --git a/app/actions/text-tool-commands.h b/app/actions/text-tool-commands.h
index 5de5242fca..fe93479568 100644
--- a/app/actions/text-tool-commands.h
+++ b/app/actions/text-tool-commands.h
@@ -19,25 +19,25 @@
#define __TEXT_TOOL_COMMANDS_H__
-void text_tool_cut_cmd_callback (GtkAction *action,
- gpointer data);
-void text_tool_copy_cmd_callback (GtkAction *action,
- gpointer data);
-void text_tool_paste_cmd_callback (GtkAction *action,
- gpointer data);
-void text_tool_delete_cmd_callback (GtkAction *action,
- gpointer data);
-void text_tool_load_cmd_callback (GtkAction *action,
- gpointer data);
-void text_tool_clear_cmd_callback (GtkAction *action,
- gpointer data);
-void text_tool_text_to_path_cmd_callback (GtkAction *action,
- gpointer data);
-void text_tool_text_along_path_cmd_callback (GtkAction *action,
- gpointer data);
-void text_tool_direction_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
+void text_tool_cut_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_tool_copy_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_tool_paste_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_tool_delete_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_tool_load_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_tool_clear_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_tool_text_to_path_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_tool_text_along_path_cmd_callback (GimpAction *action,
+ gpointer data);
+void text_tool_direction_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
#endif /* __TEXT_TOOL_COMMANDS_H__ */
diff --git a/app/actions/tool-options-commands.c b/app/actions/tool-options-commands.c
index 8eadfe1108..94325e11fe 100644
--- a/app/actions/tool-options-commands.c
+++ b/app/actions/tool-options-commands.c
@@ -62,8 +62,8 @@ static void tool_options_show_preset_editor (Gimp *gimp,
/* public functions */
void
-tool_options_save_new_preset_cmd_callback (GtkAction *action,
- gpointer user_data)
+tool_options_save_new_preset_cmd_callback (GimpAction *action,
+ gpointer user_data)
{
GimpEditor *editor = GIMP_EDITOR (user_data);
Gimp *gimp = gimp_editor_get_ui_manager (editor)->gimp;
@@ -77,9 +77,9 @@ tool_options_save_new_preset_cmd_callback (GtkAction *action,
}
void
-tool_options_save_preset_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tool_options_save_preset_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpEditor *editor = GIMP_EDITOR (data);
Gimp *gimp = gimp_editor_get_ui_manager (editor)->gimp;
@@ -100,9 +100,9 @@ tool_options_save_preset_cmd_callback (GtkAction *action,
}
void
-tool_options_restore_preset_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tool_options_restore_preset_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpEditor *editor = GIMP_EDITOR (data);
Gimp *gimp = gimp_editor_get_ui_manager (editor)->gimp;
@@ -123,9 +123,9 @@ tool_options_restore_preset_cmd_callback (GtkAction *action,
}
void
-tool_options_edit_preset_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tool_options_edit_preset_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpEditor *editor = GIMP_EDITOR (data);
Gimp *gimp = gimp_editor_get_ui_manager (editor)->gimp;
@@ -143,9 +143,9 @@ tool_options_edit_preset_cmd_callback (GtkAction *action,
}
void
-tool_options_delete_preset_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tool_options_delete_preset_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpEditor *editor = GIMP_EDITOR (data);
GimpContext *context = gimp_get_user_context (gimp_editor_get_ui_manager (editor)->gimp);
@@ -168,8 +168,8 @@ tool_options_delete_preset_cmd_callback (GtkAction *action,
}
void
-tool_options_reset_cmd_callback (GtkAction *action,
- gpointer data)
+tool_options_reset_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpEditor *editor = GIMP_EDITOR (data);
GimpContext *context = gimp_get_user_context (gimp_editor_get_ui_manager (editor)->gimp);
@@ -179,8 +179,8 @@ tool_options_reset_cmd_callback (GtkAction *action,
}
void
-tool_options_reset_all_cmd_callback (GtkAction *action,
- gpointer data)
+tool_options_reset_all_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpEditor *editor = GIMP_EDITOR (data);
GtkWidget *dialog;
diff --git a/app/actions/tool-options-commands.h b/app/actions/tool-options-commands.h
index 53e7ae1cf5..9da8dc071b 100644
--- a/app/actions/tool-options-commands.h
+++ b/app/actions/tool-options-commands.h
@@ -19,26 +19,26 @@
#define __TOOL_OPTIONS_COMMANDS_H__
-void tool_options_save_new_preset_cmd_callback (GtkAction *action,
- gpointer data);
+void tool_options_save_new_preset_cmd_callback (GimpAction *action,
+ gpointer data);
-void tool_options_save_preset_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void tool_options_restore_preset_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void tool_options_edit_preset_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void tool_options_delete_preset_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void tool_options_save_preset_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void tool_options_restore_preset_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void tool_options_edit_preset_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void tool_options_delete_preset_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void tool_options_reset_cmd_callback (GtkAction *action,
- gpointer data);
-void tool_options_reset_all_cmd_callback (GtkAction *action,
- gpointer data);
+void tool_options_reset_cmd_callback (GimpAction *action,
+ gpointer data);
+void tool_options_reset_all_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __TOOL_OPTIONS_COMMANDS_H__ */
diff --git a/app/actions/tool-preset-editor-commands.c b/app/actions/tool-preset-editor-commands.c
index 862712bafa..300429fd1c 100644
--- a/app/actions/tool-preset-editor-commands.c
+++ b/app/actions/tool-preset-editor-commands.c
@@ -40,8 +40,8 @@
/* public functions */
void
-tool_preset_editor_save_cmd_callback (GtkAction *action,
- gpointer data)
+tool_preset_editor_save_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDataEditor *editor = GIMP_DATA_EDITOR (data);
GimpContext *context = editor->context;
@@ -74,8 +74,8 @@ tool_preset_editor_save_cmd_callback (GtkAction *action,
}
void
-tool_preset_editor_restore_cmd_callback (GtkAction *action,
- gpointer data)
+tool_preset_editor_restore_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDataEditor *editor = GIMP_DATA_EDITOR (data);
GimpContext *context = editor->context;
diff --git a/app/actions/tool-preset-editor-commands.h b/app/actions/tool-preset-editor-commands.h
index 885a3201ba..35649d33a0 100644
--- a/app/actions/tool-preset-editor-commands.h
+++ b/app/actions/tool-preset-editor-commands.h
@@ -19,10 +19,10 @@
#define __TOOL_PRESET_EDITOR_COMMANDS_H__
-void tool_preset_editor_save_cmd_callback (GtkAction *action,
- gpointer data);
-void tool_preset_editor_restore_cmd_callback (GtkAction *action,
- gpointer data);
+void tool_preset_editor_save_cmd_callback (GimpAction *action,
+ gpointer data);
+void tool_preset_editor_restore_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __TOOL_PRESET_EDITOR_COMMANDS_H__ */
diff --git a/app/actions/tool-presets-commands.c b/app/actions/tool-presets-commands.c
index 1d8b85b308..785f83b981 100644
--- a/app/actions/tool-presets-commands.c
+++ b/app/actions/tool-presets-commands.c
@@ -41,8 +41,8 @@
/* public functions */
void
-tool_presets_save_cmd_callback (GtkAction *action,
- gpointer data)
+tool_presets_save_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
@@ -77,8 +77,8 @@ tool_presets_save_cmd_callback (GtkAction *action,
}
void
-tool_presets_restore_cmd_callback (GtkAction *action,
- gpointer data)
+tool_presets_restore_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
diff --git a/app/actions/tool-presets-commands.h b/app/actions/tool-presets-commands.h
index 0bae3211d0..b6a6f75387 100644
--- a/app/actions/tool-presets-commands.h
+++ b/app/actions/tool-presets-commands.h
@@ -19,10 +19,10 @@
#define __TOOL_PRESETS_COMMANDS_H__
-void tool_presets_save_cmd_callback (GtkAction *action,
- gpointer data);
-void tool_presets_restore_cmd_callback (GtkAction *action,
- gpointer data);
+void tool_presets_save_cmd_callback (GimpAction *action,
+ gpointer data);
+void tool_presets_restore_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __TOOL_PRESETS_COMMANDS_H__ */
diff --git a/app/actions/tools-commands.c b/app/actions/tools-commands.c
index 5780ef2de1..aa0935b62d 100644
--- a/app/actions/tools-commands.c
+++ b/app/actions/tools-commands.c
@@ -63,7 +63,7 @@ static void tools_activate_enum_action (const gchar *action_desc,
/* public functions */
void
-tools_select_cmd_callback (GtkAction *action,
+tools_select_cmd_callback (GimpAction *action,
const gchar *value,
gpointer data)
{
@@ -108,9 +108,9 @@ tools_select_cmd_callback (GtkAction *action,
}
void
-tools_color_average_radius_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_color_average_radius_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -129,9 +129,9 @@ tools_color_average_radius_cmd_callback (GtkAction *action,
}
void
-tools_paintbrush_size_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_paintbrush_size_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -150,9 +150,9 @@ tools_paintbrush_size_cmd_callback (GtkAction *action,
}
void
-tools_paintbrush_angle_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_paintbrush_angle_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -171,9 +171,9 @@ tools_paintbrush_angle_cmd_callback (GtkAction *action,
}
void
-tools_paintbrush_aspect_ratio_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_paintbrush_aspect_ratio_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -192,9 +192,9 @@ tools_paintbrush_aspect_ratio_cmd_callback (GtkAction *action,
}
void
-tools_paintbrush_spacing_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_paintbrush_spacing_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -213,9 +213,9 @@ tools_paintbrush_spacing_cmd_callback (GtkAction *action,
}
void
-tools_paintbrush_hardness_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_paintbrush_hardness_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -234,9 +234,9 @@ tools_paintbrush_hardness_cmd_callback (GtkAction *action,
}
void
-tools_paintbrush_force_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_paintbrush_force_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -255,9 +255,9 @@ tools_paintbrush_force_cmd_callback (GtkAction *action,
}
void
-tools_ink_blob_size_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_ink_blob_size_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -276,9 +276,9 @@ tools_ink_blob_size_cmd_callback (GtkAction *action,
}
void
-tools_ink_blob_aspect_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_ink_blob_aspect_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -297,9 +297,9 @@ tools_ink_blob_aspect_cmd_callback (GtkAction *action,
}
void
-tools_ink_blob_angle_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_ink_blob_angle_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -321,9 +321,9 @@ tools_ink_blob_angle_cmd_callback (GtkAction *action,
}
void
-tools_airbrush_rate_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_airbrush_rate_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -342,9 +342,9 @@ tools_airbrush_rate_cmd_callback (GtkAction *action,
}
void
-tools_airbrush_flow_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_airbrush_flow_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -363,9 +363,9 @@ tools_airbrush_flow_cmd_callback (GtkAction *action,
}
void
-tools_mybrush_radius_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_mybrush_radius_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -384,9 +384,9 @@ tools_mybrush_radius_cmd_callback (GtkAction *action,
}
void
-tools_mybrush_hardness_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_mybrush_hardness_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -405,9 +405,9 @@ tools_mybrush_hardness_cmd_callback (GtkAction *action,
}
void
-tools_fg_select_brush_size_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_fg_select_brush_size_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -426,9 +426,9 @@ tools_fg_select_brush_size_cmd_callback (GtkAction *action,
}
void
-tools_transform_preview_opacity_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_transform_preview_opacity_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -447,9 +447,9 @@ tools_transform_preview_opacity_cmd_callback (GtkAction *action,
}
void
-tools_warp_effect_size_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_warp_effect_size_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -468,9 +468,9 @@ tools_warp_effect_size_cmd_callback (GtkAction *action,
}
void
-tools_warp_effect_hardness_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_warp_effect_hardness_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpToolInfo *tool_info;
@@ -489,9 +489,9 @@ tools_warp_effect_hardness_cmd_callback (GtkAction *action,
}
void
-tools_opacity_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_opacity_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -511,9 +511,9 @@ tools_opacity_cmd_callback (GtkAction *action,
}
void
-tools_size_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_size_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -533,9 +533,9 @@ tools_size_cmd_callback (GtkAction *action,
}
void
-tools_aspect_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_aspect_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -555,9 +555,9 @@ tools_aspect_cmd_callback (GtkAction *action,
}
void
-tools_angle_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_angle_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -577,9 +577,9 @@ tools_angle_cmd_callback (GtkAction *action,
}
void
-tools_spacing_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_spacing_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -599,9 +599,9 @@ tools_spacing_cmd_callback (GtkAction *action,
}
void
-tools_hardness_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_hardness_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -621,9 +621,9 @@ tools_hardness_cmd_callback (GtkAction *action,
}
void
-tools_force_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_force_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -643,9 +643,9 @@ tools_force_cmd_callback (GtkAction *action,
}
void
-tools_object_1_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_object_1_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -665,9 +665,9 @@ tools_object_1_cmd_callback (GtkAction *action,
}
void
-tools_object_2_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_object_2_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
diff --git a/app/actions/tools-commands.h b/app/actions/tools-commands.h
index 4b1892db19..c17a717ffa 100644
--- a/app/actions/tools-commands.h
+++ b/app/actions/tools-commands.h
@@ -19,98 +19,98 @@
#define __TOOLS_COMMANDS_H__
-void tools_select_cmd_callback (GtkAction *action,
+void tools_select_cmd_callback (GimpAction *action,
const gchar *value,
gpointer data);
-void tools_color_average_radius_cmd_callback (GtkAction *action,
+void tools_color_average_radius_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_paintbrush_size_cmd_callback (GtkAction *action,
+void tools_paintbrush_size_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_paintbrush_angle_cmd_callback (GtkAction *action,
+void tools_paintbrush_angle_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_paintbrush_aspect_ratio_cmd_callback (GtkAction *action,
+void tools_paintbrush_aspect_ratio_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_paintbrush_spacing_cmd_callback (GtkAction *action,
+void tools_paintbrush_spacing_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_paintbrush_hardness_cmd_callback (GtkAction *action,
+void tools_paintbrush_hardness_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_paintbrush_force_cmd_callback (GtkAction *action,
+void tools_paintbrush_force_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_ink_blob_size_cmd_callback (GtkAction *action,
+void tools_ink_blob_size_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_ink_blob_aspect_cmd_callback (GtkAction *action,
+void tools_ink_blob_aspect_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_ink_blob_angle_cmd_callback (GtkAction *action,
+void tools_ink_blob_angle_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_airbrush_rate_cmd_callback (GtkAction *action,
+void tools_airbrush_rate_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_airbrush_flow_cmd_callback (GtkAction *action,
+void tools_airbrush_flow_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_mybrush_radius_cmd_callback (GtkAction *action,
+void tools_mybrush_radius_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_mybrush_hardness_cmd_callback (GtkAction *action,
+void tools_mybrush_hardness_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_fg_select_brush_size_cmd_callback (GtkAction *action,
+void tools_fg_select_brush_size_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_transform_preview_opacity_cmd_callback (GtkAction *action,
+void tools_transform_preview_opacity_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_warp_effect_size_cmd_callback (GtkAction *action,
+void tools_warp_effect_size_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_warp_effect_hardness_cmd_callback (GtkAction *action,
+void tools_warp_effect_hardness_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_opacity_cmd_callback (GtkAction *action,
+void tools_opacity_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_size_cmd_callback (GtkAction *action,
+void tools_size_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_aspect_cmd_callback (GtkAction *action,
+void tools_aspect_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_angle_cmd_callback (GtkAction *action,
+void tools_angle_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_spacing_cmd_callback (GtkAction *action,
+void tools_spacing_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_hardness_cmd_callback (GtkAction *action,
+void tools_hardness_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_force_cmd_callback (GtkAction *action,
+void tools_force_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_object_1_cmd_callback (GtkAction *action,
+void tools_object_1_cmd_callback (GimpAction *action,
gint value,
gpointer data);
-void tools_object_2_cmd_callback (GtkAction *action,
+void tools_object_2_cmd_callback (GimpAction *action,
gint value,
gpointer data);
diff --git a/app/actions/vectors-commands.c b/app/actions/vectors-commands.c
index 4aaf3b5499..d7c8bc4579 100644
--- a/app/actions/vectors-commands.c
+++ b/app/actions/vectors-commands.c
@@ -111,8 +111,8 @@ static void vectors_export_callback (GtkWidget *dialog,
/* public functions */
void
-vectors_edit_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_edit_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -138,8 +138,8 @@ vectors_edit_cmd_callback (GtkAction *action,
}
void
-vectors_edit_attributes_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_edit_attributes_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -180,8 +180,8 @@ vectors_edit_attributes_cmd_callback (GtkAction *action,
}
void
-vectors_new_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_new_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -221,8 +221,8 @@ vectors_new_cmd_callback (GtkAction *action,
}
void
-vectors_new_last_vals_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_new_last_vals_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -238,8 +238,8 @@ vectors_new_last_vals_cmd_callback (GtkAction *action,
}
void
-vectors_raise_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_raise_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -250,8 +250,8 @@ vectors_raise_cmd_callback (GtkAction *action,
}
void
-vectors_raise_to_top_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_raise_to_top_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -262,8 +262,8 @@ vectors_raise_to_top_cmd_callback (GtkAction *action,
}
void
-vectors_lower_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_lower_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -274,8 +274,8 @@ vectors_lower_cmd_callback (GtkAction *action,
}
void
-vectors_lower_to_bottom_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_lower_to_bottom_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -286,8 +286,8 @@ vectors_lower_to_bottom_cmd_callback (GtkAction *action,
}
void
-vectors_duplicate_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_duplicate_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -307,8 +307,8 @@ vectors_duplicate_cmd_callback (GtkAction *action,
}
void
-vectors_delete_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_delete_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -319,8 +319,8 @@ vectors_delete_cmd_callback (GtkAction *action,
}
void
-vectors_merge_visible_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_merge_visible_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -342,9 +342,9 @@ vectors_merge_visible_cmd_callback (GtkAction *action,
}
void
-vectors_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+vectors_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -357,9 +357,9 @@ vectors_to_selection_cmd_callback (GtkAction *action,
}
void
-vectors_selection_to_vectors_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+vectors_selection_to_vectors_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -412,8 +412,8 @@ vectors_selection_to_vectors_cmd_callback (GtkAction *action,
}
void
-vectors_fill_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_fill_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -429,8 +429,8 @@ vectors_fill_cmd_callback (GtkAction *action,
}
void
-vectors_fill_last_vals_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_fill_last_vals_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -442,8 +442,8 @@ vectors_fill_last_vals_cmd_callback (GtkAction *action,
}
void
-vectors_stroke_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_stroke_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -459,8 +459,8 @@ vectors_stroke_cmd_callback (GtkAction *action,
}
void
-vectors_stroke_last_vals_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_stroke_last_vals_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -472,8 +472,8 @@ vectors_stroke_last_vals_cmd_callback (GtkAction *action,
}
void
-vectors_copy_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_copy_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -490,8 +490,8 @@ vectors_copy_cmd_callback (GtkAction *action,
}
void
-vectors_paste_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_paste_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -525,8 +525,8 @@ vectors_paste_cmd_callback (GtkAction *action,
}
void
-vectors_export_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_export_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -564,8 +564,8 @@ vectors_export_cmd_callback (GtkAction *action,
}
void
-vectors_import_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_import_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GtkWidget *widget;
@@ -600,8 +600,8 @@ vectors_import_cmd_callback (GtkAction *action,
}
void
-vectors_visible_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_visible_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -611,8 +611,8 @@ vectors_visible_cmd_callback (GtkAction *action,
}
void
-vectors_linked_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_linked_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -622,8 +622,8 @@ vectors_linked_cmd_callback (GtkAction *action,
}
void
-vectors_lock_content_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_lock_content_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -633,8 +633,8 @@ vectors_lock_content_cmd_callback (GtkAction *action,
}
void
-vectors_lock_position_cmd_callback (GtkAction *action,
- gpointer data)
+vectors_lock_position_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -644,9 +644,9 @@ vectors_lock_position_cmd_callback (GtkAction *action,
}
void
-vectors_color_tag_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+vectors_color_tag_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
@@ -829,9 +829,9 @@ vectors_export_callback (GtkWidget *dialog,
}
void
-vectors_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+vectors_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpImage *image;
GimpVectors *vectors;
diff --git a/app/actions/vectors-commands.h b/app/actions/vectors-commands.h
index dc20c2582b..e9a9d2895b 100644
--- a/app/actions/vectors-commands.h
+++ b/app/actions/vectors-commands.h
@@ -19,70 +19,70 @@
#define __VECTORS_COMMANDS_H__
-void vectors_edit_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_edit_attributes_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_new_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_new_last_vals_cmd_callback (GtkAction *action,
- gpointer data);
+void vectors_edit_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_edit_attributes_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_new_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_new_last_vals_cmd_callback (GimpAction *action,
+ gpointer data);
-void vectors_raise_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_raise_to_top_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_lower_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_lower_to_bottom_cmd_callback (GtkAction *action,
- gpointer data);
+void vectors_raise_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_raise_to_top_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_lower_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_lower_to_bottom_cmd_callback (GimpAction *action,
+ gpointer data);
-void vectors_duplicate_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_delete_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_merge_visible_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_to_selection_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void vectors_selection_to_vectors_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void vectors_duplicate_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_delete_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_merge_visible_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_to_selection_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void vectors_selection_to_vectors_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void vectors_fill_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_fill_last_vals_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_stroke_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_stroke_last_vals_cmd_callback (GtkAction *action,
- gpointer data);
+void vectors_fill_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_fill_last_vals_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_stroke_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_stroke_last_vals_cmd_callback (GimpAction *action,
+ gpointer data);
-void vectors_copy_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_paste_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_export_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_import_cmd_callback (GtkAction *action,
- gpointer data);
+void vectors_copy_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_paste_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_export_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_import_cmd_callback (GimpAction *action,
+ gpointer data);
-void vectors_visible_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_linked_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_lock_content_cmd_callback (GtkAction *action,
- gpointer data);
-void vectors_lock_position_cmd_callback (GtkAction *action,
- gpointer data);
+void vectors_visible_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_linked_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_lock_content_cmd_callback (GimpAction *action,
+ gpointer data);
+void vectors_lock_position_cmd_callback (GimpAction *action,
+ gpointer data);
-void vectors_color_tag_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void vectors_color_tag_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void vectors_select_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void vectors_select_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
#endif /* __VECTORS_COMMANDS_H__ */
diff --git a/app/actions/view-commands.c b/app/actions/view-commands.c
index 018cc06626..c4cad7dfc3 100644
--- a/app/actions/view-commands.c
+++ b/app/actions/view-commands.c
@@ -94,8 +94,8 @@ static void view_padding_color_dialog_update (GimpColorDialog *dialog
/* public functions */
void
-view_new_cmd_callback (GtkAction *action,
- gpointer data)
+view_new_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
@@ -111,8 +111,8 @@ view_new_cmd_callback (GtkAction *action,
}
void
-view_close_cmd_callback (GtkAction *action,
- gpointer data)
+view_close_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
@@ -128,8 +128,8 @@ view_close_cmd_callback (GtkAction *action,
}
void
-view_scroll_center_cmd_callback (GtkAction *action,
- gpointer data)
+view_scroll_center_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
return_if_no_display (display, data);
@@ -139,8 +139,8 @@ view_scroll_center_cmd_callback (GtkAction *action,
}
void
-view_zoom_fit_in_cmd_callback (GtkAction *action,
- gpointer data)
+view_zoom_fit_in_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
return_if_no_display (display, data);
@@ -149,8 +149,8 @@ view_zoom_fit_in_cmd_callback (GtkAction *action,
}
void
-view_zoom_fill_cmd_callback (GtkAction *action,
- gpointer data)
+view_zoom_fill_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
return_if_no_display (display, data);
@@ -159,8 +159,8 @@ view_zoom_fill_cmd_callback (GtkAction *action,
}
void
-view_zoom_selection_cmd_callback (GtkAction *action,
- gpointer data)
+view_zoom_selection_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpImage *image;
@@ -178,8 +178,8 @@ view_zoom_selection_cmd_callback (GtkAction *action,
}
void
-view_zoom_revert_cmd_callback (GtkAction *action,
- gpointer data)
+view_zoom_revert_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
return_if_no_display (display, data);
@@ -188,9 +188,9 @@ view_zoom_revert_cmd_callback (GtkAction *action,
}
void
-view_zoom_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+view_zoom_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpDisplayShell *shell;
return_if_no_shell (shell, data);
@@ -263,9 +263,9 @@ view_zoom_cmd_callback (GtkAction *action,
}
void
-view_zoom_explicit_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+view_zoom_explicit_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpDisplayShell *shell;
gint value;
@@ -284,8 +284,8 @@ view_zoom_explicit_cmd_callback (GtkAction *action,
}
void
-view_zoom_other_cmd_callback (GtkAction *action,
- gpointer data)
+view_zoom_other_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
return_if_no_shell (shell, data);
@@ -301,8 +301,8 @@ view_zoom_other_cmd_callback (GtkAction *action,
}
void
-view_dot_for_dot_cmd_callback (GtkAction *action,
- gpointer data)
+view_dot_for_dot_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
@@ -330,8 +330,8 @@ view_dot_for_dot_cmd_callback (GtkAction *action,
}
void
-view_flip_horizontally_cmd_callback (GtkAction *action,
- gpointer data)
+view_flip_horizontally_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
@@ -349,8 +349,8 @@ view_flip_horizontally_cmd_callback (GtkAction *action,
}
void
-view_flip_vertically_cmd_callback (GtkAction *action,
- gpointer data)
+view_flip_vertically_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
@@ -368,9 +368,9 @@ view_flip_vertically_cmd_callback (GtkAction *action,
}
void
-view_rotate_absolute_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+view_rotate_absolute_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
@@ -392,9 +392,9 @@ view_rotate_absolute_cmd_callback (GtkAction *action,
}
void
-view_rotate_relative_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+view_rotate_relative_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
@@ -413,8 +413,8 @@ view_rotate_relative_cmd_callback (GtkAction *action,
}
void
-view_rotate_other_cmd_callback (GtkAction *action,
- gpointer data)
+view_rotate_other_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
@@ -426,9 +426,9 @@ view_rotate_other_cmd_callback (GtkAction *action,
}
void
-view_scroll_horizontal_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+view_scroll_horizontal_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpDisplayShell *shell;
gdouble offset;
@@ -450,9 +450,9 @@ view_scroll_horizontal_cmd_callback (GtkAction *action,
}
void
-view_scroll_vertical_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+view_scroll_vertical_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpDisplayShell *shell;
gdouble offset;
@@ -474,8 +474,8 @@ view_scroll_vertical_cmd_callback (GtkAction *action,
}
void
-view_navigation_window_cmd_callback (GtkAction *action,
- gpointer data)
+view_navigation_window_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
GimpDisplayShell *shell;
@@ -491,8 +491,8 @@ view_navigation_window_cmd_callback (GtkAction *action,
}
void
-view_display_filters_cmd_callback (GtkAction *action,
- gpointer data)
+view_display_filters_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
GtkWidget *dialog;
@@ -513,8 +513,8 @@ view_display_filters_cmd_callback (GtkAction *action,
}
void
-view_color_management_reset_cmd_callback (GtkAction *action,
- gpointer data)
+view_color_management_reset_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
GimpColorConfig *global_config;
@@ -531,8 +531,8 @@ view_color_management_reset_cmd_callback (GtkAction *action,
}
void
-view_color_management_enable_cmd_callback (GtkAction *action,
- gpointer data)
+view_color_management_enable_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
GimpColorConfig *color_config;
@@ -566,8 +566,8 @@ view_color_management_enable_cmd_callback (GtkAction *action,
}
void
-view_color_management_softproof_cmd_callback (GtkAction *action,
- gpointer data)
+view_color_management_softproof_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
GimpColorConfig *color_config;
@@ -601,9 +601,9 @@ view_color_management_softproof_cmd_callback (GtkAction *action,
}
void
-view_display_intent_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+view_display_intent_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpDisplayShell *shell;
GimpColorConfig *color_config;
@@ -624,8 +624,8 @@ view_display_intent_cmd_callback (GtkAction *action,
}
void
-view_display_bpc_cmd_callback (GtkAction *action,
- gpointer data)
+view_display_bpc_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
GimpColorConfig *color_config;
@@ -646,8 +646,8 @@ view_display_bpc_cmd_callback (GtkAction *action,
}
void
-view_softproof_profile_cmd_callback (GtkAction *action,
- gpointer data)
+view_softproof_profile_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpImage *image;
GimpDisplayShell *shell;
@@ -687,9 +687,9 @@ view_softproof_profile_cmd_callback (GtkAction *action,
}
void
-view_softproof_intent_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+view_softproof_intent_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GimpDisplayShell *shell;
GimpColorConfig *color_config;
@@ -710,8 +710,8 @@ view_softproof_intent_cmd_callback (GtkAction *action,
}
void
-view_softproof_bpc_cmd_callback (GtkAction *action,
- gpointer data)
+view_softproof_bpc_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
GimpColorConfig *color_config;
@@ -732,8 +732,8 @@ view_softproof_bpc_cmd_callback (GtkAction *action,
}
void
-view_softproof_gamut_check_cmd_callback (GtkAction *action,
- gpointer data)
+view_softproof_gamut_check_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
GimpColorConfig *color_config;
@@ -754,8 +754,8 @@ view_softproof_gamut_check_cmd_callback (GtkAction *action,
}
void
-view_toggle_selection_cmd_callback (GtkAction *action,
- gpointer data)
+view_toggle_selection_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -770,8 +770,8 @@ view_toggle_selection_cmd_callback (GtkAction *action,
}
void
-view_toggle_layer_boundary_cmd_callback (GtkAction *action,
- gpointer data)
+view_toggle_layer_boundary_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -786,8 +786,8 @@ view_toggle_layer_boundary_cmd_callback (GtkAction *action,
}
void
-view_toggle_menubar_cmd_callback (GtkAction *action,
- gpointer data)
+view_toggle_menubar_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -802,8 +802,8 @@ view_toggle_menubar_cmd_callback (GtkAction *action,
}
void
-view_toggle_rulers_cmd_callback (GtkAction *action,
- gpointer data)
+view_toggle_rulers_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -818,8 +818,8 @@ view_toggle_rulers_cmd_callback (GtkAction *action,
}
void
-view_toggle_scrollbars_cmd_callback (GtkAction *action,
- gpointer data)
+view_toggle_scrollbars_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -834,8 +834,8 @@ view_toggle_scrollbars_cmd_callback (GtkAction *action,
}
void
-view_toggle_statusbar_cmd_callback (GtkAction *action,
- gpointer data)
+view_toggle_statusbar_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -850,8 +850,8 @@ view_toggle_statusbar_cmd_callback (GtkAction *action,
}
void
-view_toggle_guides_cmd_callback (GtkAction *action,
- gpointer data)
+view_toggle_guides_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -866,8 +866,8 @@ view_toggle_guides_cmd_callback (GtkAction *action,
}
void
-view_toggle_grid_cmd_callback (GtkAction *action,
- gpointer data)
+view_toggle_grid_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -882,8 +882,8 @@ view_toggle_grid_cmd_callback (GtkAction *action,
}
void
-view_toggle_sample_points_cmd_callback (GtkAction *action,
- gpointer data)
+view_toggle_sample_points_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -898,8 +898,8 @@ view_toggle_sample_points_cmd_callback (GtkAction *action,
}
void
-view_snap_to_guides_cmd_callback (GtkAction *action,
- gpointer data)
+view_snap_to_guides_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -914,8 +914,8 @@ view_snap_to_guides_cmd_callback (GtkAction *action,
}
void
-view_snap_to_grid_cmd_callback (GtkAction *action,
- gpointer data)
+view_snap_to_grid_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -930,8 +930,8 @@ view_snap_to_grid_cmd_callback (GtkAction *action,
}
void
-view_snap_to_canvas_cmd_callback (GtkAction *action,
- gpointer data)
+view_snap_to_canvas_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -946,8 +946,8 @@ view_snap_to_canvas_cmd_callback (GtkAction *action,
}
void
-view_snap_to_vectors_cmd_callback (GtkAction *action,
- gpointer data)
+view_snap_to_vectors_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
gboolean active;
@@ -962,9 +962,9 @@ view_snap_to_vectors_cmd_callback (GtkAction *action,
}
void
-view_padding_color_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+view_padding_color_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data)
{
GimpDisplay *display;
GimpImageWindow *window;
@@ -1057,8 +1057,8 @@ view_padding_color_cmd_callback (GtkAction *action,
}
void
-view_shrink_wrap_cmd_callback (GtkAction *action,
- gpointer data)
+view_shrink_wrap_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplayShell *shell;
return_if_no_shell (shell, data);
@@ -1067,8 +1067,8 @@ view_shrink_wrap_cmd_callback (GtkAction *action,
}
void
-view_fullscreen_cmd_callback (GtkAction *action,
- gpointer data)
+view_fullscreen_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
diff --git a/app/actions/view-commands.h b/app/actions/view-commands.h
index bed47dd20a..04d1837d8b 100644
--- a/app/actions/view-commands.h
+++ b/app/actions/view-commands.h
@@ -19,116 +19,116 @@
#define __VIEW_COMMANDS_H__
-void view_new_cmd_callback (GtkAction *action,
- gpointer data);
-void view_close_cmd_callback (GtkAction *action,
- gpointer data);
+void view_new_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_close_cmd_callback (GimpAction *action,
+ gpointer data);
-void view_scroll_center_cmd_callback (GtkAction *action,
- gpointer data);
+void view_scroll_center_cmd_callback (GimpAction *action,
+ gpointer data);
-void view_zoom_fit_in_cmd_callback (GtkAction *action,
- gpointer data);
-void view_zoom_fill_cmd_callback (GtkAction *action,
- gpointer data);
-void view_zoom_selection_cmd_callback (GtkAction *action,
- gpointer data);
-void view_zoom_revert_cmd_callback (GtkAction *action,
- gpointer data);
-void view_zoom_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void view_zoom_explicit_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void view_zoom_other_cmd_callback (GtkAction *action,
- gpointer data);
-void view_dot_for_dot_cmd_callback (GtkAction *action,
- gpointer data);
+void view_zoom_fit_in_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_zoom_fill_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_zoom_selection_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_zoom_revert_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_zoom_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void view_zoom_explicit_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void view_zoom_other_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_dot_for_dot_cmd_callback (GimpAction *action,
+ gpointer data);
-void view_scroll_horizontal_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void view_scroll_vertical_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void view_scroll_horizontal_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void view_scroll_vertical_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void view_flip_horizontally_cmd_callback (GtkAction *action,
- gpointer data);
-void view_flip_vertically_cmd_callback (GtkAction *action,
- gpointer data);
+void view_flip_horizontally_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_flip_vertically_cmd_callback (GimpAction *action,
+ gpointer data);
-void view_rotate_absolute_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void view_rotate_relative_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
-void view_rotate_other_cmd_callback (GtkAction *action,
- gpointer data);
+void view_rotate_absolute_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void view_rotate_relative_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
+void view_rotate_other_cmd_callback (GimpAction *action,
+ gpointer data);
-void view_navigation_window_cmd_callback (GtkAction *action,
- gpointer data);
-void view_display_filters_cmd_callback (GtkAction *action,
- gpointer data);
+void view_navigation_window_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_display_filters_cmd_callback (GimpAction *action,
+ gpointer data);
-void view_color_management_reset_cmd_callback (GtkAction *action,
- gpointer data);
-void view_color_management_enable_cmd_callback(GtkAction *action,
- gpointer data);
+void view_color_management_reset_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_color_management_enable_cmd_callback(GimpAction *action,
+ gpointer data);
void view_color_management_softproof_cmd_callback
- (GtkAction *action,
- gpointer data);
-void view_display_intent_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void view_display_bpc_cmd_callback (GtkAction *action,
- gpointer data);
-void view_softproof_profile_cmd_callback (GtkAction *action,
- gpointer data);
-void view_softproof_intent_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void view_softproof_bpc_cmd_callback (GtkAction *action,
- gpointer data);
-void view_softproof_gamut_check_cmd_callback (GtkAction *action,
- gpointer data);
+ (GimpAction *action,
+ gpointer data);
+void view_display_intent_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void view_display_bpc_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_softproof_profile_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_softproof_intent_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+void view_softproof_bpc_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_softproof_gamut_check_cmd_callback (GimpAction *action,
+ gpointer data);
-void view_toggle_selection_cmd_callback (GtkAction *action,
- gpointer data);
-void view_toggle_layer_boundary_cmd_callback (GtkAction *action,
- gpointer data);
-void view_toggle_menubar_cmd_callback (GtkAction *action,
- gpointer data);
-void view_toggle_rulers_cmd_callback (GtkAction *action,
- gpointer data);
-void view_toggle_scrollbars_cmd_callback (GtkAction *action,
- gpointer data);
-void view_toggle_statusbar_cmd_callback (GtkAction *action,
- gpointer data);
-void view_toggle_guides_cmd_callback (GtkAction *action,
- gpointer data);
-void view_toggle_grid_cmd_callback (GtkAction *action,
- gpointer data);
-void view_toggle_sample_points_cmd_callback (GtkAction *action,
- gpointer data);
+void view_toggle_selection_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_toggle_layer_boundary_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_toggle_menubar_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_toggle_rulers_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_toggle_scrollbars_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_toggle_statusbar_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_toggle_guides_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_toggle_grid_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_toggle_sample_points_cmd_callback (GimpAction *action,
+ gpointer data);
-void view_snap_to_guides_cmd_callback (GtkAction *action,
- gpointer data);
-void view_snap_to_grid_cmd_callback (GtkAction *action,
- gpointer data);
-void view_snap_to_canvas_cmd_callback (GtkAction *action,
- gpointer data);
-void view_snap_to_vectors_cmd_callback (GtkAction *action,
- gpointer data);
-void view_padding_color_cmd_callback (GtkAction *action,
- gint value,
- gpointer data);
+void view_snap_to_guides_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_snap_to_grid_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_snap_to_canvas_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_snap_to_vectors_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_padding_color_cmd_callback (GimpAction *action,
+ gint value,
+ gpointer data);
-void view_shrink_wrap_cmd_callback (GtkAction *action,
- gpointer data);
-void view_fullscreen_cmd_callback (GtkAction *action,
- gpointer data);
+void view_shrink_wrap_cmd_callback (GimpAction *action,
+ gpointer data);
+void view_fullscreen_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __VIEW_COMMANDS_H__ */
diff --git a/app/actions/window-commands.c b/app/actions/window-commands.c
index bcc0bd5b79..3a8810db47 100644
--- a/app/actions/window-commands.c
+++ b/app/actions/window-commands.c
@@ -38,8 +38,8 @@
/* public functions */
void
-window_close_cmd_callback (GtkAction *action,
- gpointer data)
+window_close_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
@@ -60,8 +60,8 @@ window_close_cmd_callback (GtkAction *action,
}
void
-window_open_display_cmd_callback (GtkAction *action,
- gpointer data)
+window_open_display_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWidget *widget;
GtkWidget *dialog;
@@ -132,9 +132,9 @@ window_open_display_cmd_callback (GtkAction *action,
}
void
-window_move_to_screen_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+window_move_to_screen_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
GtkWidget *widget;
GdkScreen *screen;
diff --git a/app/actions/window-commands.h b/app/actions/window-commands.h
index cc5e4c5cc2..91964a6779 100644
--- a/app/actions/window-commands.h
+++ b/app/actions/window-commands.h
@@ -19,13 +19,13 @@
#define __WINDOW_COMMANDS_H__
-void window_close_cmd_callback (GtkAction *action,
- gpointer data);
-void window_open_display_cmd_callback (GtkAction *action,
- gpointer data);
-void window_move_to_screen_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
+void window_close_cmd_callback (GimpAction *action,
+ gpointer data);
+void window_open_display_cmd_callback (GimpAction *action,
+ gpointer data);
+void window_move_to_screen_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
#endif /* __WINDOW_COMMANDS_H__ */
diff --git a/app/actions/windows-commands.c b/app/actions/windows-commands.c
index 1f38b977ba..70536d5ca6 100644
--- a/app/actions/windows-commands.c
+++ b/app/actions/windows-commands.c
@@ -52,8 +52,8 @@
void
-windows_hide_docks_cmd_callback (GtkAction *action,
- gpointer data)
+windows_hide_docks_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
gboolean active;
@@ -68,8 +68,8 @@ windows_hide_docks_cmd_callback (GtkAction *action,
}
void
-windows_show_tabs_cmd_callback (GtkAction *action,
- gpointer data)
+windows_use_single_window_mode_cmd_callback (GimpAction *action,
+ gpointer data)
{
Gimp *gimp;
gboolean active;
@@ -77,49 +77,49 @@ windows_show_tabs_cmd_callback (GtkAction *action,
active = gimp_toggle_action_get_active (GIMP_TOGGLE_ACTION (action));
- if (active != GIMP_GUI_CONFIG (gimp->config)->show_tabs)
+ if (active != GIMP_GUI_CONFIG (gimp->config)->single_window_mode)
g_object_set (gimp->config,
- "show-tabs", active,
+ "single-window-mode", active,
NULL);
}
-
void
-windows_set_tabs_position_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data)
+windows_show_tabs_cmd_callback (GimpAction *action,
+ gpointer data)
{
- Gimp *gimp;
- GimpPosition value;
+ Gimp *gimp;
+ gboolean active;
return_if_no_gimp (gimp, data);
- value = gimp_radio_action_get_current_value (GIMP_RADIO_ACTION (action));
+ active = gimp_toggle_action_get_active (GIMP_TOGGLE_ACTION (action));
- if (value != GIMP_GUI_CONFIG (gimp->config)->tabs_position)
+ if (active != GIMP_GUI_CONFIG (gimp->config)->show_tabs)
g_object_set (gimp->config,
- "tabs-position", value,
+ "show-tabs", active,
NULL);
}
+
void
-windows_use_single_window_mode_cmd_callback (GtkAction *action,
- gpointer data)
+windows_set_tabs_position_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data)
{
- Gimp *gimp;
- gboolean active;
+ Gimp *gimp;
+ GimpPosition value;
return_if_no_gimp (gimp, data);
- active = gimp_toggle_action_get_active (GIMP_TOGGLE_ACTION (action));
+ value = gimp_radio_action_get_current_value (GIMP_RADIO_ACTION (action));
- if (active != GIMP_GUI_CONFIG (gimp->config)->single_window_mode)
+ if (value != GIMP_GUI_CONFIG (gimp->config)->tabs_position)
g_object_set (gimp->config,
- "single-window-mode", active,
+ "tabs-position", value,
NULL);
}
void
-windows_show_display_next_cmd_callback (GtkAction *action,
- gpointer data)
+windows_show_display_next_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
Gimp *gimp;
@@ -140,8 +140,8 @@ windows_show_display_next_cmd_callback (GtkAction *action,
}
void
-windows_show_display_previous_cmd_callback (GtkAction *action,
- gpointer data)
+windows_show_display_previous_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display;
Gimp *gimp;
@@ -162,8 +162,8 @@ windows_show_display_previous_cmd_callback (GtkAction *action,
}
void
-windows_show_display_cmd_callback (GtkAction *action,
- gpointer data)
+windows_show_display_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpDisplay *display = g_object_get_data (G_OBJECT (action), "display");
@@ -171,8 +171,8 @@ windows_show_display_cmd_callback (GtkAction *action,
}
void
-windows_show_dock_cmd_callback (GtkAction *action,
- gpointer data)
+windows_show_dock_cmd_callback (GimpAction *action,
+ gpointer data)
{
GtkWindow *dock_window = g_object_get_data (G_OBJECT (action), "dock-window");
@@ -180,8 +180,8 @@ windows_show_dock_cmd_callback (GtkAction *action,
}
void
-windows_open_recent_cmd_callback (GtkAction *action,
- gpointer data)
+windows_open_recent_cmd_callback (GimpAction *action,
+ gpointer data)
{
GimpSessionInfo *info;
GimpDialogFactoryEntry *entry;
diff --git a/app/actions/windows-commands.h b/app/actions/windows-commands.h
index 88955b3dd4..e3d307bba4 100644
--- a/app/actions/windows-commands.h
+++ b/app/actions/windows-commands.h
@@ -19,28 +19,27 @@
#define __WINDOWS_COMMANDS_H__
-void windows_hide_docks_cmd_callback (GtkAction *action,
- gpointer data);
-
-void windows_show_tabs_cmd_callback (GtkAction *action,
- gpointer data);
-
-void windows_set_tabs_position_cmd_callback (GtkAction *action,
- GtkAction *current,
- gpointer data);
-void windows_use_single_window_mode_cmd_callback (GtkAction *action,
- gpointer data);
-
-void windows_show_display_next_cmd_callback (GtkAction *action,
- gpointer data);
-void windows_show_display_previous_cmd_callback (GtkAction *action,
- gpointer data);
-void windows_show_display_cmd_callback (GtkAction *action,
- gpointer data);
-void windows_show_dock_cmd_callback (GtkAction *action,
- gpointer data);
-void windows_open_recent_cmd_callback (GtkAction *action,
- gpointer data);
+void windows_hide_docks_cmd_callback (GimpAction *action,
+ gpointer data);
+void windows_use_single_window_mode_cmd_callback (GimpAction *action,
+ gpointer data);
+
+void windows_show_tabs_cmd_callback (GimpAction *action,
+ gpointer data);
+void windows_set_tabs_position_cmd_callback (GimpAction *action,
+ GimpAction *current,
+ gpointer data);
+
+void windows_show_display_next_cmd_callback (GimpAction *action,
+ gpointer data);
+void windows_show_display_previous_cmd_callback (GimpAction *action,
+ gpointer data);
+void windows_show_display_cmd_callback (GimpAction *action,
+ gpointer data);
+void windows_show_dock_cmd_callback (GimpAction *action,
+ gpointer data);
+void windows_open_recent_cmd_callback (GimpAction *action,
+ gpointer data);
#endif /* __WINDOWS_COMMANDS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
