diff --git a/ChangeLog b/ChangeLog
index 74916d5b6a..96f03e076f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-07-17  Sven Neumann  <sven@gimp.org>
+
+	* app/core/gimptoolinfo.c (gimp_tool_info_new): use the tool-info
+	identifier as the name of the tool-options object.
+
+	* app/paint/gimppaintoptions.c (gimp_paint_options_new): use the
+	paint-info identifier as the name of the paint-options object.
+
+	* app/paint/gimp-paint.c (gimp_paint_register): added parameter check.
+
+	* app/tools/gimp-tools.c (gimp_tools_init): formatting.
+
 2007-07-17  Sven Neumann  <sven@gimp.org>
 
 	* app/plug-in/gimppluginprocedure.c
diff --git a/app/core/gimptoolinfo.c b/app/core/gimptoolinfo.c
index 4e210c8ca6..7ca8ee19d0 100644
--- a/app/core/gimptoolinfo.c
+++ b/app/core/gimptoolinfo.c
@@ -264,6 +264,7 @@ gimp_tool_info_new (Gimp                *gimp,
     {
       tool_info->tool_options = g_object_new (tool_info->tool_options_type,
                                               "gimp", gimp,
+                                              "name", identifier,
                                               NULL);
     }
 
diff --git a/app/paint/gimp-paint.c b/app/paint/gimp-paint.c
index 2470c4d4c9..7e43cc8871 100644
--- a/app/paint/gimp-paint.c
+++ b/app/paint/gimp-paint.c
@@ -119,6 +119,7 @@ gimp_paint_register (Gimp        *gimp,
   g_return_if_fail (GIMP_IS_GIMP (gimp));
   g_return_if_fail (g_type_is_a (paint_type, GIMP_TYPE_PAINT_CORE));
   g_return_if_fail (g_type_is_a (paint_options_type, GIMP_TYPE_PAINT_OPTIONS));
+  g_return_if_fail (identifier != NULL);
   g_return_if_fail (blurb != NULL);
 
   paint_info = gimp_paint_info_new (gimp,
diff --git a/app/paint/gimppaintoptions.c b/app/paint/gimppaintoptions.c
index c7c2acea79..28626b25f9 100644
--- a/app/paint/gimppaintoptions.c
+++ b/app/paint/gimppaintoptions.c
@@ -107,8 +107,7 @@ static void   gimp_paint_options_notify       (GObject      *object,
                                                GParamSpec   *pspec);
 
 
-G_DEFINE_TYPE (GimpPaintOptions, gimp_paint_options,
-               GIMP_TYPE_TOOL_OPTIONS)
+G_DEFINE_TYPE (GimpPaintOptions, gimp_paint_options, GIMP_TYPE_TOOL_OPTIONS)
 
 #define parent_class gimp_paint_options_parent_class
 
@@ -545,6 +544,7 @@ gimp_paint_options_new (GimpPaintInfo *paint_info)
 
   options = g_object_new (paint_info->paint_options_type,
                           "gimp",       paint_info->gimp,
+                          "name",       GIMP_OBJECT (paint_info)->name,
                           "paint-info", paint_info,
                           NULL);
 
diff --git a/app/tools/gimp-tools.c b/app/tools/gimp-tools.c
index 6e7c865f8e..da771ee2ea 100644
--- a/app/tools/gimp-tools.c
+++ b/app/tools/gimp-tools.c
@@ -199,7 +199,8 @@ gimp_tools_init (Gimp *gimp)
 
   default_order = g_list_reverse (default_order);
 
-  g_object_set_data (G_OBJECT (gimp), "gimp-tools-default-order", default_order);
+  g_object_set_data (G_OBJECT (gimp),
+                     "gimp-tools-default-order", default_order);
 }
 
 void