Commit b9d47f2d 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.
parent 738c0358
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
/* public functions */ /* public functions */
void void
buffers_paste_cmd_callback (GtkAction *action, buffers_paste_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data); GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container; GimpContainer *container;
...@@ -96,8 +96,8 @@ buffers_paste_cmd_callback (GtkAction *action, ...@@ -96,8 +96,8 @@ buffers_paste_cmd_callback (GtkAction *action,
} }
void void
buffers_paste_as_new_image_cmd_callback (GtkAction *action, buffers_paste_as_new_image_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data); GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContainer *container; GimpContainer *container;
...@@ -124,8 +124,8 @@ buffers_paste_as_new_image_cmd_callback (GtkAction *action, ...@@ -124,8 +124,8 @@ buffers_paste_as_new_image_cmd_callback (GtkAction *action,
} }
void void
buffers_delete_cmd_callback (GtkAction *action, buffers_delete_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data); GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
......
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
#define __BUFFERS_COMMANDS_H__ #define __BUFFERS_COMMANDS_H__
void buffers_paste_cmd_callback (GtkAction *action, void buffers_paste_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data); gpointer data);
void buffers_paste_as_new_image_cmd_callback (GtkAction *action, void buffers_paste_as_new_image_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void buffers_delete_cmd_callback (GtkAction *action, void buffers_delete_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
#endif /* __BUFFERS_COMMANDS_H__ */ #endif /* __BUFFERS_COMMANDS_H__ */
...@@ -90,8 +90,8 @@ static void channels_edit_attributes_callback (GtkWidget *dialog, ...@@ -90,8 +90,8 @@ static void channels_edit_attributes_callback (GtkWidget *dialog,
/* public functions */ /* public functions */
void void
channels_edit_attributes_cmd_callback (GtkAction *action, channels_edit_attributes_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -136,8 +136,8 @@ channels_edit_attributes_cmd_callback (GtkAction *action, ...@@ -136,8 +136,8 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
} }
void void
channels_new_cmd_callback (GtkAction *action, channels_new_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GtkWidget *widget; GtkWidget *widget;
...@@ -181,8 +181,8 @@ channels_new_cmd_callback (GtkAction *action, ...@@ -181,8 +181,8 @@ channels_new_cmd_callback (GtkAction *action,
} }
void void
channels_new_last_vals_cmd_callback (GtkAction *action, channels_new_last_vals_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -207,8 +207,8 @@ channels_new_last_vals_cmd_callback (GtkAction *action, ...@@ -207,8 +207,8 @@ channels_new_last_vals_cmd_callback (GtkAction *action,
} }
void void
channels_raise_cmd_callback (GtkAction *action, channels_raise_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -219,8 +219,8 @@ channels_raise_cmd_callback (GtkAction *action, ...@@ -219,8 +219,8 @@ channels_raise_cmd_callback (GtkAction *action,
} }
void void
channels_raise_to_top_cmd_callback (GtkAction *action, channels_raise_to_top_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -231,8 +231,8 @@ channels_raise_to_top_cmd_callback (GtkAction *action, ...@@ -231,8 +231,8 @@ channels_raise_to_top_cmd_callback (GtkAction *action,
} }
void void
channels_lower_cmd_callback (GtkAction *action, channels_lower_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -243,8 +243,8 @@ channels_lower_cmd_callback (GtkAction *action, ...@@ -243,8 +243,8 @@ channels_lower_cmd_callback (GtkAction *action,
} }
void void
channels_lower_to_bottom_cmd_callback (GtkAction *action, channels_lower_to_bottom_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -255,8 +255,8 @@ channels_lower_to_bottom_cmd_callback (GtkAction *action, ...@@ -255,8 +255,8 @@ channels_lower_to_bottom_cmd_callback (GtkAction *action,
} }
void void
channels_duplicate_cmd_callback (GtkAction *action, channels_duplicate_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *new_channel; GimpChannel *new_channel;
...@@ -307,8 +307,8 @@ channels_duplicate_cmd_callback (GtkAction *action, ...@@ -307,8 +307,8 @@ channels_duplicate_cmd_callback (GtkAction *action,
} }
void void
channels_delete_cmd_callback (GtkAction *action, channels_delete_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -319,9 +319,9 @@ channels_delete_cmd_callback (GtkAction *action, ...@@ -319,9 +319,9 @@ channels_delete_cmd_callback (GtkAction *action,
} }
void void
channels_to_selection_cmd_callback (GtkAction *action, channels_to_selection_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpChannelOps op; GimpChannelOps op;
GimpImage *image; GimpImage *image;
...@@ -351,8 +351,8 @@ channels_to_selection_cmd_callback (GtkAction *action, ...@@ -351,8 +351,8 @@ channels_to_selection_cmd_callback (GtkAction *action,
} }
void void
channels_visible_cmd_callback (GtkAction *action, channels_visible_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -362,8 +362,8 @@ channels_visible_cmd_callback (GtkAction *action, ...@@ -362,8 +362,8 @@ channels_visible_cmd_callback (GtkAction *action,
} }
void void
channels_linked_cmd_callback (GtkAction *action, channels_linked_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -373,8 +373,8 @@ channels_linked_cmd_callback (GtkAction *action, ...@@ -373,8 +373,8 @@ channels_linked_cmd_callback (GtkAction *action,
} }
void void
channels_lock_content_cmd_callback (GtkAction *action, channels_lock_content_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -384,8 +384,8 @@ channels_lock_content_cmd_callback (GtkAction *action, ...@@ -384,8 +384,8 @@ channels_lock_content_cmd_callback (GtkAction *action,
} }
void void
channels_lock_position_cmd_callback (GtkAction *action, channels_lock_position_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -395,9 +395,9 @@ channels_lock_position_cmd_callback (GtkAction *action, ...@@ -395,9 +395,9 @@ channels_lock_position_cmd_callback (GtkAction *action,
} }
void void
channels_color_tag_cmd_callback (GtkAction *action, channels_color_tag_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
...@@ -408,9 +408,9 @@ channels_color_tag_cmd_callback (GtkAction *action, ...@@ -408,9 +408,9 @@ channels_color_tag_cmd_callback (GtkAction *action,
} }
void void
channels_select_cmd_callback (GtkAction *action, channels_select_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpImage *image; GimpImage *image;
GimpChannel *channel; GimpChannel *channel;
......
...@@ -19,46 +19,46 @@ ...@@ -19,46 +19,46 @@
#define __CHANNELS_COMMANDS_H__ #define __CHANNELS_COMMANDS_H__
void channels_edit_attributes_cmd_callback (GtkAction *action, void channels_edit_attributes_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_new_cmd_callback (GtkAction *action, void channels_new_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_new_last_vals_cmd_callback (GtkAction *action, void channels_new_last_vals_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_raise_cmd_callback (GtkAction *action, void channels_raise_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_raise_to_top_cmd_callback (GtkAction *action, void channels_raise_to_top_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_lower_cmd_callback (GtkAction *action, void channels_lower_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_lower_to_bottom_cmd_callback (GtkAction *action, void channels_lower_to_bottom_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_duplicate_cmd_callback (GtkAction *action, void channels_duplicate_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_delete_cmd_callback (GtkAction *action, void channels_delete_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_to_selection_cmd_callback (GtkAction *action, void channels_to_selection_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data); gpointer data);
void channels_visible_cmd_callback (GtkAction *action, void channels_visible_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_linked_cmd_callback (GtkAction *action, void channels_linked_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_lock_content_cmd_callback (GtkAction *action, void channels_lock_content_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_lock_position_cmd_callback (GtkAction *action, void channels_lock_position_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void channels_color_tag_cmd_callback (GtkAction *action, void channels_color_tag_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data); gpointer data);
void channels_select_cmd_callback (GtkAction *action, void channels_select_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data); gpointer data);
#endif /* __CHANNELS_COMMANDS_H__ */ #endif /* __CHANNELS_COMMANDS_H__ */
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
/* public functions */ /* public functions */
void void
colormap_edit_color_cmd_callback (GtkAction *action, colormap_edit_color_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (data); GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (data);
...@@ -46,9 +46,9 @@ colormap_edit_color_cmd_callback (GtkAction *action, ...@@ -46,9 +46,9 @@ colormap_edit_color_cmd_callback (GtkAction *action,
} }
void void
colormap_add_color_cmd_callback (GtkAction *action, colormap_add_color_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
GimpImage *image; GimpImage *image;
...@@ -70,9 +70,9 @@ colormap_add_color_cmd_callback (GtkAction *action, ...@@ -70,9 +70,9 @@ colormap_add_color_cmd_callback (GtkAction *action,
} }
void void
colormap_to_selection_cmd_callback (GtkAction *action, colormap_to_selection_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpColormapSelection *selection; GimpColormapSelection *selection;
GimpColormapEditor *editor; GimpColormapEditor *editor;
......
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
#define __COLORMAP_COMMANDS_H__ #define __COLORMAP_COMMANDS_H__
void colormap_edit_color_cmd_callback (GtkAction *action, void colormap_edit_color_cmd_callback (GimpAction *action,
gpointer data); gpointer data);
void colormap_add_color_cmd_callback (GtkAction *action, void colormap_add_color_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data); gpointer data);
void colormap_to_selection_cmd_callback (GtkAction *action, void colormap_to_selection_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data); gpointer data);
#endif /* __COLORMAP_COMMANDS_H__ */ #endif /* __COLORMAP_COMMANDS_H__ */
...@@ -81,8 +81,8 @@ static GimpColormapEditor * context_get_colormap_editor (void); ...@@ -81,8 +81,8 @@ static GimpColormapEditor * context_get_colormap_editor (void);
/* public functions */ /* public functions */
void void
context_colors_default_cmd_callback (GtkAction *action, context_colors_default_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
return_if_no_context (context, data); return_if_no_context (context, data);
...@@ -91,8 +91,8 @@ context_colors_default_cmd_callback (GtkAction *action, ...@@ -91,8 +91,8 @@ context_colors_default_cmd_callback (GtkAction *action,
} }
void void
context_colors_swap_cmd_callback (GtkAction *action, context_colors_swap_cmd_callback (GimpAction *action,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
return_if_no_context (context, data); return_if_no_context (context, data);
...@@ -102,9 +102,9 @@ context_colors_swap_cmd_callback (GtkAction *action, ...@@ -102,9 +102,9 @@ context_colors_swap_cmd_callback (GtkAction *action,
#define SELECT_COLOR_CMD_CALLBACK(name, fgbg, use_colormap, use_palette) \ #define SELECT_COLOR_CMD_CALLBACK(name, fgbg, use_colormap, use_palette) \
void \ void \
context_##name##_##fgbg##ground_cmd_callback (GtkAction *action, \ context_##name##_##fgbg##ground_cmd_callback (GimpAction *action, \
gint value, \ gint value, \
gpointer data) \ gpointer data) \
{ \ { \
GimpContext *context; \ GimpContext *context; \
GimpRGB color; \ GimpRGB color; \
...@@ -124,9 +124,9 @@ SELECT_COLOR_CMD_CALLBACK (swatch, fore, TRUE, TRUE) ...@@ -124,9 +124,9 @@ SELECT_COLOR_CMD_CALLBACK (swatch, fore, TRUE, TRUE)
SELECT_COLOR_CMD_CALLBACK (swatch, back, TRUE, TRUE) SELECT_COLOR_CMD_CALLBACK (swatch, back, TRUE, TRUE)
void void
context_foreground_red_cmd_callback (GtkAction *action, context_foreground_red_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
GimpRGB color; GimpRGB color;
...@@ -141,9 +141,9 @@ context_foreground_red_cmd_callback (GtkAction *action, ...@@ -141,9 +141,9 @@ context_foreground_red_cmd_callback (GtkAction *action,
} }
void void
context_foreground_green_cmd_callback (GtkAction *action, context_foreground_green_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
GimpRGB color; GimpRGB color;
...@@ -158,9 +158,9 @@ context_foreground_green_cmd_callback (GtkAction *action, ...@@ -158,9 +158,9 @@ context_foreground_green_cmd_callback (GtkAction *action,
} }
void void
context_foreground_blue_cmd_callback (GtkAction *action, context_foreground_blue_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
GimpRGB color; GimpRGB color;
...@@ -175,9 +175,9 @@ context_foreground_blue_cmd_callback (GtkAction *action, ...@@ -175,9 +175,9 @@ context_foreground_blue_cmd_callback (GtkAction *action,
} }
void void
context_background_red_cmd_callback (GtkAction *action, context_background_red_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
GimpRGB color; GimpRGB color;
...@@ -192,9 +192,9 @@ context_background_red_cmd_callback (GtkAction *action, ...@@ -192,9 +192,9 @@ context_background_red_cmd_callback (GtkAction *action,
} }
void void
context_background_green_cmd_callback (GtkAction *action, context_background_green_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
GimpRGB color; GimpRGB color;
...@@ -209,9 +209,9 @@ context_background_green_cmd_callback (GtkAction *action, ...@@ -209,9 +209,9 @@ context_background_green_cmd_callback (GtkAction *action,
} }
void void
context_background_blue_cmd_callback (GtkAction *action, context_background_blue_cmd_callback (GimpAction *action,
gint value, gint value,
gpointer data)