Commit a1a8f006 authored by Michael Natterer's avatar Michael Natterer 😴

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 b9d47f2d)
parent 345acca1
......@@ -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);
......
......@@ -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__ */
......@@ -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;
......
......@@ -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__ */
......@@ -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;
......
......@@ -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__ */
......@@ -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