[gimp/soc-2009-dynamics] Some reordering and cleanup

[Michael Natterer <mitch src gnome org>]

commit af8b47efe98b2cefbc535deb58621485a174f5d6
Author: Michael Natterer <mitch gimp org>
Date:   Sun Oct 11 00:00:45 2009 +0200

    Some reordering and cleanup

 app/actions/actions.c                 |    6 +++---
 app/actions/dialogs-actions.c         |   11 +++++------
 app/actions/dynamics-actions.c        |    1 -
 app/actions/dynamics-editor-actions.c |   10 +++++-----
 4 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/app/actions/actions.c b/app/actions/actions.c
index f17fbcd..83a5991 100644
--- a/app/actions/actions.c
+++ b/app/actions/actions.c
@@ -146,6 +146,9 @@ static const GimpActionFactoryEntry action_groups[] =
   { "drawable", N_("Drawable"), GIMP_STOCK_LAYER,
     drawable_actions_setup,
     drawable_actions_update },
+  { "dynamics", N_("Dynamics"), GIMP_STOCK_DYNAMICS,
+    dynamics_actions_setup,
+    dynamics_actions_update },
   { "dynamics-editor", N_("Dynamics Editor"), GIMP_STOCK_DYNAMICS,
     dynamics_editor_actions_setup,
     dynamics_editor_actions_update },
@@ -188,9 +191,6 @@ static const GimpActionFactoryEntry action_groups[] =
   { "patterns", N_("Patterns"), GIMP_STOCK_PATTERN,
     patterns_actions_setup,
     patterns_actions_update },
-  { "dynamics", N_("Dynamics"), GIMP_STOCK_DYNAMICS,
-    dynamics_actions_setup,
-    dynamics_actions_update },
   { "plug-in", N_("Plug-Ins"), GIMP_STOCK_PLUGIN,
     plug_in_actions_setup,
     plug_in_actions_update },
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
index 2c1b601..b9b1f65 100644
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@@ -124,18 +124,17 @@ const GimpStringActionEntry dialogs_dockable_actions[] =
     "gimp-brush-editor",
     GIMP_HELP_BRUSH_EDIT },
 
-  { "dialogs-dynamics-editor", GIMP_STOCK_DYNAMICS,
-    NC_("dialogs-action", "Dynamics Editor"), NULL,
-    NC_("dialogs-action", "Open the dynamics editor"),
-    "gimp-dynamics-editor",
-    GIMP_HELP_DYNAMICS_EDITOR_DIALOG },
-
   { "dialogs-dynamics", GIMP_STOCK_PATTERN,
     NC_("dialogs-action", "Dynamics"), NULL,
     NC_("dialogs-action", "Open dynamics list dialog"),
     "gimp-dynamics-list",
     GIMP_HELP_DYNAMICS_DIALOG },
 
+  { "dialogs-dynamics-editor", GIMP_STOCK_DYNAMICS,
+    NC_("dialogs-action", "Dynamics Editor"), NULL,
+    NC_("dialogs-action", "Open the dynamics editor"),
+    "gimp-dynamics-editor",
+    GIMP_HELP_DYNAMICS_EDITOR_DIALOG },
 
   { "dialogs-patterns", GIMP_STOCK_PATTERN,
     NC_("dialogs-action", "P_atterns"), "<control><shift>P",
diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c
index 42c4f5b..685d43d 100644
--- a/app/actions/dynamics-actions.c
+++ b/app/actions/dynamics-actions.c
@@ -116,7 +116,6 @@ dynamics_actions_update (GimpActionGroup *group,
         gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
 
   SET_SENSITIVE ("dynamics-edit",          dynamics && FALSE);
-// SET_SENSITIVE ("dynamics-open-as-image", dynamics && data->filename);
   SET_SENSITIVE ("dynamics-duplicate",     dynamics && GIMP_DATA_GET_CLASS (data)->duplicate);
   SET_SENSITIVE ("dynamics-copy-location", dynamics && data->filename);
   SET_SENSITIVE ("dynamics-delete",        dynamics && data->deletable);
diff --git a/app/actions/dynamics-editor-actions.c b/app/actions/dynamics-editor-actions.c
index 800ada3..29df1c6 100644
--- a/app/actions/dynamics-editor-actions.c
+++ b/app/actions/dynamics-editor-actions.c
@@ -28,13 +28,13 @@
 
 #include "widgets/gimpactiongroup.h"
 #include "widgets/gimphelp-ids.h"
-#include "widgets/gimpbrusheditor.h"
 
 #include "dynamics-editor-actions.h"
 #include "data-editor-commands.h"
 
 #include "gimp-intl.h"
 
+
 static const GimpActionEntry dynamics_editor_actions[] =
 {
   { "dynamics-editor-popup", GIMP_STOCK_DYNAMICS,
@@ -70,10 +70,10 @@ void
 dynamics_editor_actions_update (GimpActionGroup *group,
                                 gpointer         user_data)
 {
-  GimpDataEditor  *data_editor = GIMP_DATA_EDITOR (user_data);
-  GimpData        *data;
-  gboolean         editable    = FALSE;
-  gboolean         edit_active = FALSE;
+  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (user_data);
+  GimpData       *data;
+  gboolean        editable    = FALSE;
+  gboolean        edit_active = FALSE;
 
   data = data_editor->data;