[gimp] app: s/paint_brush/paintbrush/ in the paintbrush action code

[Michael Natterer <mitch src gnome org>]

commit 242ccacdcc98c9fa221c259e1d681350eb840a4f
Author: Michael Natterer <mitch gimp org>
Date:   Sat May 3 22:55:05 2014 +0200

    app: s/paint_brush/paintbrush/ in the paintbrush action code

 app/actions/tools-actions.c  |   30 +++++++++++++++---------------
 app/actions/tools-commands.c |   18 +++++++++---------
 app/actions/tools-commands.h |    8 +++-----
 app/tools/gimpbrushtool.c    |    6 +++---
 app/widgets/gimpaction.c     |    6 +++---
 5 files changed, 33 insertions(+), 35 deletions(-)
---
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index 0dfac56..bb88890 100644
--- a/app/actions/tools-actions.c
+++ b/app/actions/tools-actions.c
@@ -73,25 +73,25 @@ static const GimpEnumActionEntry tools_color_average_radius_actions[] =
     NULL }
 };
 
-static const GimpEnumActionEntry tools_paint_brush_size_actions[] =
+static const GimpEnumActionEntry tools_paintbrush_size_actions[] =
 {
-  { "tools-paint-brush-size-set", GIMP_STOCK_TOOL_PAINTBRUSH,
+  { "tools-paintbrush-size-set", GIMP_STOCK_TOOL_PAINTBRUSH,
     "Set Brush Size", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
 
-static const GimpEnumActionEntry tools_paint_brush_angle_actions[] =
+static const GimpEnumActionEntry tools_paintbrush_angle_actions[] =
 {
-  { "tools-paint-brush-angle-set", GIMP_STOCK_TOOL_PAINTBRUSH,
+  { "tools-paintbrush-angle-set", GIMP_STOCK_TOOL_PAINTBRUSH,
     "Set Brush Angle", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
 
-static const GimpEnumActionEntry tools_paint_brush_aspect_ratio_actions[] =
+static const GimpEnumActionEntry tools_paintbrush_aspect_ratio_actions[] =
 {
-  { "tools-paint-brush-aspect-ratio-set", GIMP_STOCK_TOOL_PAINTBRUSH,
+  { "tools-paintbrush-aspect-ratio-set", GIMP_STOCK_TOOL_PAINTBRUSH,
     "Set Brush Aspect Ratio", NULL, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
@@ -397,19 +397,19 @@ tools_actions_setup (GimpActionGroup *group)
                                       G_CALLBACK (tools_color_average_radius_cmd_callback));
 
   gimp_action_group_add_enum_actions (group, NULL,
-                                      tools_paint_brush_size_actions,
-                                      G_N_ELEMENTS (tools_paint_brush_size_actions),
-                                      G_CALLBACK (tools_paint_brush_size_cmd_callback));
+                                      tools_paintbrush_size_actions,
+                                      G_N_ELEMENTS (tools_paintbrush_size_actions),
+                                      G_CALLBACK (tools_paintbrush_size_cmd_callback));
 
   gimp_action_group_add_enum_actions (group, NULL,
-                                      tools_paint_brush_angle_actions,
-                                      G_N_ELEMENTS (tools_paint_brush_angle_actions),
-                                      G_CALLBACK (tools_paint_brush_angle_cmd_callback));
+                                      tools_paintbrush_angle_actions,
+                                      G_N_ELEMENTS (tools_paintbrush_angle_actions),
+                                      G_CALLBACK (tools_paintbrush_angle_cmd_callback));
 
   gimp_action_group_add_enum_actions (group, NULL,
-                                      tools_paint_brush_aspect_ratio_actions,
-                                      G_N_ELEMENTS (tools_paint_brush_aspect_ratio_actions),
-                                      G_CALLBACK (tools_paint_brush_aspect_ratio_cmd_callback));
+                                      tools_paintbrush_aspect_ratio_actions,
+                                      G_N_ELEMENTS (tools_paintbrush_aspect_ratio_actions),
+                                      G_CALLBACK (tools_paintbrush_aspect_ratio_cmd_callback));
 
   gimp_action_group_add_enum_actions (group, NULL,
                                       tools_ink_blob_size_actions,
diff --git a/app/actions/tools-commands.c b/app/actions/tools-commands.c
index a21dc95..6fc6cf6 100644
--- a/app/actions/tools-commands.c
+++ b/app/actions/tools-commands.c
@@ -125,9 +125,9 @@ tools_color_average_radius_cmd_callback (GtkAction *action,
 }
 
 void
-tools_paint_brush_size_cmd_callback (GtkAction *action,
-                                     gint       value,
-                                     gpointer   data)
+tools_paintbrush_size_cmd_callback (GtkAction *action,
+                                    gint       value,
+                                    gpointer   data)
 {
   GimpContext  *context;
   GimpToolInfo *tool_info;
@@ -146,9 +146,9 @@ tools_paint_brush_size_cmd_callback (GtkAction *action,
 }
 
 void
-tools_paint_brush_angle_cmd_callback (GtkAction *action,
-                                      gint       value,
-                                      gpointer   data)
+tools_paintbrush_angle_cmd_callback (GtkAction *action,
+                                     gint       value,
+                                     gpointer   data)
 {
   GimpContext  *context;
   GimpToolInfo *tool_info;
@@ -167,9 +167,9 @@ tools_paint_brush_angle_cmd_callback (GtkAction *action,
 }
 
 void
-tools_paint_brush_aspect_ratio_cmd_callback (GtkAction *action,
-                                             gint       value,
-                                             gpointer   data)
+tools_paintbrush_aspect_ratio_cmd_callback (GtkAction *action,
+                                            gint       value,
+                                            gpointer   data)
 {
   GimpContext  *context;
   GimpToolInfo *tool_info;
diff --git a/app/actions/tools-commands.h b/app/actions/tools-commands.h
index 4ad5760..cfeca2e 100644
--- a/app/actions/tools-commands.h
+++ b/app/actions/tools-commands.h
@@ -27,15 +27,13 @@ void   tools_color_average_radius_cmd_callback      (GtkAction   *action,
                                                      gint         value,
                                                      gpointer     data);
 
-void   tools_paint_brush_size_cmd_callback          (GtkAction   *action,
+void   tools_paintbrush_size_cmd_callback           (GtkAction   *action,
                                                      gint         value,
                                                      gpointer     data);
-
-void   tools_paint_brush_angle_cmd_callback         (GtkAction   *action,
+void   tools_paintbrush_angle_cmd_callback          (GtkAction   *action,
                                                      gint         value,
                                                      gpointer     data);
-
-void   tools_paint_brush_aspect_ratio_cmd_callback  (GtkAction   *action,
+void   tools_paintbrush_aspect_ratio_cmd_callback   (GtkAction   *action,
                                                      gint         value,
                                                      gpointer     data);
 
diff --git a/app/tools/gimpbrushtool.c b/app/tools/gimpbrushtool.c
index 9b5c253..7c97c23 100644
--- a/app/tools/gimpbrushtool.c
+++ b/app/tools/gimpbrushtool.c
@@ -102,11 +102,11 @@ gimp_brush_tool_init (GimpBrushTool *brush_tool)
   GimpTool *tool = GIMP_TOOL (brush_tool);
 
   gimp_tool_control_set_action_size     (tool->control,
-                                         "tools/tools-paint-brush-size-set");
+                                         "tools/tools-paintbrush-size-set");
   gimp_tool_control_set_action_aspect   (tool->control,
-                                         "tools/tools-paint-brush-aspect-ratio-set");
+                                         "tools/tools-paintbrush-aspect-ratio-set");
   gimp_tool_control_set_action_angle    (tool->control,
-                                         "tools/tools-paint-brush-angle-set");
+                                         "tools/tools-paintbrush-angle-set");
   gimp_tool_control_set_action_object_1 (tool->control,
                                          "context/context-brush-select-set");
 }
diff --git a/app/widgets/gimpaction.c b/app/widgets/gimpaction.c
index 425f3eb..76039ad 100644
--- a/app/widgets/gimpaction.c
+++ b/app/widgets/gimpaction.c
@@ -330,9 +330,9 @@ gimp_action_is_gui_blacklisted (const gchar *action_name)
     {
       "<",
       "tools-color-average-radius-",
-      "tools-paint-brush-size-",
-      "tools-paint-brush-angle-",
-      "tools-paint-brush-aspect-ratio-",
+      "tools-paintbrush-size-",
+      "tools-paintbrush-angle-",
+      "tools-paintbrush-aspect-ratio-",
       "tools-ink-blob-size-",
       "tools-ink-blob-aspect-",
       "tools-ink-blob-angle-",