[gimp/soc-2009-dynamics] Formatting cleanup

[Michael Natterer <mitch src gnome org>]

commit f5f571bce580fc0a0ecff0c58b15ecd7214d916b
Author: Michael Natterer <mitch gimp org>
Date:   Sat Oct 3 13:53:40 2009 +0200

    Formatting cleanup

 app/actions/actions.c         |    8 ++++----
 app/actions/dialogs-actions.c |    2 --
 app/core/gimpcontext.c        |   39 +++++++++++++++++----------------------
 3 files changed, 21 insertions(+), 28 deletions(-)
---
diff --git a/app/actions/actions.c b/app/actions/actions.c
index eb737be..2078150 100644
--- a/app/actions/actions.c
+++ b/app/actions/actions.c
@@ -51,7 +51,6 @@
 
 #include "actions.h"
 #include "brush-editor-actions.h"
-#include "dynamics-editor-actions.h"
 #include "brushes-actions.h"
 #include "buffers-actions.h"
 #include "channels-actions.h"
@@ -65,6 +64,7 @@
 #include "dockable-actions.h"
 #include "documents-actions.h"
 #include "drawable-actions.h"
+#include "dynamics-editor-actions.h"
 #include "edit-actions.h"
 #include "error-console-actions.h"
 #include "file-actions.h"
@@ -106,9 +106,6 @@ static const GimpActionFactoryEntry action_groups[] =
   { "brush-editor", N_("Brush Editor"), GIMP_STOCK_BRUSH,
     brush_editor_actions_setup,
     brush_editor_actions_update },
-  { "dynamics-editor", N_("Dynamics Editor"), GIMP_STOCK_DYNAMICS,
-    dynamics_editor_actions_setup,
-    dynamics_editor_actions_update },
   { "brushes", N_("Brushes"), GIMP_STOCK_BRUSH,
     brushes_actions_setup,
     brushes_actions_update },
@@ -148,6 +145,9 @@ static const GimpActionFactoryEntry action_groups[] =
   { "drawable", N_("Drawable"), GIMP_STOCK_LAYER,
     drawable_actions_setup,
     drawable_actions_update },
+  { "dynamics-editor", N_("Dynamics Editor"), GIMP_STOCK_DYNAMICS,
+    dynamics_editor_actions_setup,
+    dynamics_editor_actions_update },
   { "edit", N_("Edit"), GTK_STOCK_EDIT,
     edit_actions_setup,
     edit_actions_update },
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
index 53458d6..f3fdbb5 100644
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@@ -118,7 +118,6 @@ const GimpStringActionEntry dialogs_dockable_actions[] =
     "gimp-brush-grid|gimp-brush-list",
     GIMP_HELP_BRUSH_DIALOG },
 
-
   { "dialogs-brush-editor", GIMP_STOCK_BRUSH,
     NC_("dialogs-action", "Brush Editor"), NULL,
     NC_("dialogs-action", "Open the brush editor"),
@@ -131,7 +130,6 @@ const GimpStringActionEntry dialogs_dockable_actions[] =
     "gimp-dynamics-editor",
     GIMP_HELP_DYNAMICS_EDITOR_DIALOG },
 
-
   { "dialogs-patterns", GIMP_STOCK_PATTERN,
     NC_("dialogs-action", "P_atterns"), "<control><shift>P",
     NC_("dialogs-action", "Open the patterns dialog"),
diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c
index 5b2318a..541e45f 100644
--- a/app/core/gimpcontext.c
+++ b/app/core/gimpcontext.c
@@ -37,6 +37,7 @@
 #include "gimpcontainer.h"
 #include "gimpcontext.h"
 #include "gimpdatafactory.h"
+#include "gimpdynamics.h"
 #include "gimpimagefile.h"
 #include "gimpgradient.h"
 #include "gimpimage.h"
@@ -47,8 +48,6 @@
 #include "gimptemplate.h"
 #include "gimptoolinfo.h"
 
-#include "gimpdynamics.h"
-
 #include "text/gimpfont.h"
 
 #include "gimp-intl.h"
@@ -158,14 +157,13 @@ static void gimp_context_brush_removed       (GimpContainer    *brush_list,
                                               GimpContext      *context);
 static void gimp_context_brush_list_thaw     (GimpContainer    *container,
                                               GimpContext      *context);
-
 static void gimp_context_real_set_brush      (GimpContext      *context,
                                               GimpBrush        *brush);
 
 /*  dynamics  */
 
-static void gimp_context_dynamics_dirty      (GimpDynamics   *dynamics,
-                                              GimpContext    *context);
+static void gimp_context_dynamics_dirty      (GimpDynamics     *dynamics,
+                                              GimpContext      *context);
 static void gimp_context_dynamics_removed    (GimpContainer    *container,
                                               GimpDynamics     *dynamics,
                                               GimpContext      *context);
@@ -351,7 +349,7 @@ static guint gimp_context_signals[LAST_SIGNAL] = { 0 };
 static GimpToolInfo  *standard_tool_info  = NULL;
 static GimpPaintInfo *standard_paint_info = NULL;
 static GimpBrush     *standard_brush      = NULL;
-static GimpDynamics  *standard_dynamics      = NULL;
+static GimpDynamics  *standard_dynamics   = NULL;
 static GimpPattern   *standard_pattern    = NULL;
 static GimpGradient  *standard_gradient   = NULL;
 static GimpPalette   *standard_palette    = NULL;
@@ -2496,8 +2494,8 @@ gimp_context_get_dynamics (GimpContext *context)
 }
 
 void
-gimp_context_set_dynamics (GimpContext           *context,
-                           GimpDynamics          *dynamics)
+gimp_context_set_dynamics (GimpContext  *context,
+                           GimpDynamics *dynamics)
 {
   g_return_if_fail (GIMP_IS_CONTEXT (context));
   g_return_if_fail (! dynamics || GIMP_IS_DYNAMICS (dynamics));
@@ -2517,16 +2515,16 @@ gimp_context_dynamics_changed (GimpContext *context)
 }
 
 static void
-gimp_context_dynamics_dirty (GimpDynamics   *dynamics,
-                             GimpContext           *context)
+gimp_context_dynamics_dirty (GimpDynamics *dynamics,
+                             GimpContext  *context)
 {
   g_free (context->dynamics_name);
   context->dynamics_name = g_strdup (GIMP_DYNAMICS (dynamics)->name);
 }
 
-static void gimp_context_dynamics_removed    (GimpContainer    *container,
-                                              GimpDynamics  *dynamics,
-                                              GimpContext      *context)
+static void gimp_context_dynamics_removed (GimpContainer *container,
+                                           GimpDynamics  *dynamics,
+                                           GimpContext   *context)
 {
   if (dynamics == context->dynamics)
     {
@@ -2543,8 +2541,8 @@ static void gimp_context_dynamics_removed    (GimpContainer    *container,
 }
 
 
-static void gimp_context_dynamics_list_thaw  (GimpContainer    *container,
-                                              GimpContext      *context)
+static void gimp_context_dynamics_list_thaw (GimpContainer *container,
+                                             GimpContext   *context)
 {
   GimpDynamics *dynamics;
   /*
@@ -2552,18 +2550,17 @@ static void gimp_context_dynamics_list_thaw  (GimpContainer    *container,
     context->dynamics_name = g_strdup (context->gimp->config->default_dynamics);
   */
   dynamics = gimp_context_find_object (context, container,
-                                    context->dynamics_name,
-                                    gimp_dynamics_get_standard ());
+                                       context->dynamics_name,
+                                       gimp_dynamics_get_standard ());
 
   gimp_context_real_set_dynamics (context, dynamics);
 }
 
 
 static void
-gimp_context_real_set_dynamics (GimpContext           *context,
-                                GimpDynamics          *dynamics)
+gimp_context_real_set_dynamics (GimpContext  *context,
+                                GimpDynamics *dynamics)
 {
-
   if (! standard_dynamics)
     {
       standard_dynamics = GIMP_DYNAMICS (gimp_dynamics_get_standard ());
@@ -2574,7 +2571,6 @@ gimp_context_real_set_dynamics (GimpContext           *context,
       return;
     }
 
-
   if (context->dynamics_name && dynamics != standard_dynamics)
     {
       g_free (context->dynamics_name);
@@ -2592,7 +2588,6 @@ gimp_context_real_set_dynamics (GimpContext           *context,
 
   context->dynamics = dynamics;
 
-
   if (dynamics)
     {
       g_object_ref (dynamics);