diff --git a/ChangeLog b/ChangeLog
index f0181539fb..9d959b1ffb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-18  Michael Natterer  <mitch@gimp.org>
+
+	* app/core/gimpstrokeoptions.[ch]: renamed public function
+	set_dash_pattern() to take_dash_pattern() to clarify memory
+	management of the passed GArray.
+
+	* app/widgets/gimpdasheditor.c
+	* app/widgets/gimpstrokeeditor.c: changed accordingly.
+
 2008-05-18  Michael Natterer  <mitch@gimp.org>
 
 	* app/core/gimpcurve.c: implement the GimpConfig interface and add
diff --git a/app/core/gimpstrokeoptions.c b/app/core/gimpstrokeoptions.c
index b1475a5f11..6afa8695b9 100644
--- a/app/core/gimpstrokeoptions.c
+++ b/app/core/gimpstrokeoptions.c
@@ -186,8 +186,8 @@ gimp_stroke_options_set_property (GObject      *object,
         GArray      *pattern;
 
         pattern = gimp_dash_pattern_from_value_array (value_array);
-        gimp_stroke_options_set_dash_pattern (options, GIMP_DASH_CUSTOM,
-                                              pattern);
+        gimp_stroke_options_take_dash_pattern (options, GIMP_DASH_CUSTOM,
+                                               pattern);
       }
       break;
 
@@ -247,7 +247,7 @@ gimp_stroke_options_get_property (GObject    *object,
 }
 
 /**
- * gimp_stroke_options_set_dash_pattern:
+ * gimp_stroke_options_take_dash_pattern:
  * @options: a #GimpStrokeOptions object
  * @preset: a value out of the #GimpDashPreset enum
  * @pattern: a #GArray or %NULL if @preset is not %GIMP_DASH_CUSTOM
@@ -258,9 +258,9 @@ gimp_stroke_options_get_property (GObject    *object,
  * of the passed pattern.
  */
 void
-gimp_stroke_options_set_dash_pattern (GimpStrokeOptions *options,
-                                      GimpDashPreset     preset,
-                                      GArray            *pattern)
+gimp_stroke_options_take_dash_pattern (GimpStrokeOptions *options,
+                                       GimpDashPreset     preset,
+                                       GArray            *pattern)
 {
   g_return_if_fail (GIMP_IS_STROKE_OPTIONS (options));
   g_return_if_fail (preset == GIMP_DASH_CUSTOM || pattern == NULL);
diff --git a/app/core/gimpstrokeoptions.h b/app/core/gimpstrokeoptions.h
index 9f6fccadc7..c41af32008 100644
--- a/app/core/gimpstrokeoptions.h
+++ b/app/core/gimpstrokeoptions.h
@@ -65,11 +65,11 @@ struct _GimpStrokeOptionsClass
 };
 
 
-GType  gimp_stroke_options_get_type         (void) G_GNUC_CONST;
+GType  gimp_stroke_options_get_type          (void) G_GNUC_CONST;
 
-void   gimp_stroke_options_set_dash_pattern (GimpStrokeOptions *options,
-                                             GimpDashPreset     preset,
-                                             GArray            *pattern);
+void   gimp_stroke_options_take_dash_pattern (GimpStrokeOptions *options,
+                                              GimpDashPreset     preset,
+                                              GArray            *pattern);
 
 
 #endif  /*  __GIMP_STROKE_OPTIONS_H__  */
diff --git a/app/widgets/gimpdasheditor.c b/app/widgets/gimpdasheditor.c
index 911200ad2c..e4cf80e845 100644
--- a/app/widgets/gimpdasheditor.c
+++ b/app/widgets/gimpdasheditor.c
@@ -479,8 +479,8 @@ update_options_from_segments (GimpDashEditor *editor)
                                                          editor->n_segments,
                                                          editor->dash_length);
 
-  gimp_stroke_options_set_dash_pattern (editor->stroke_options,
-                                        GIMP_DASH_CUSTOM, pattern);
+  gimp_stroke_options_take_dash_pattern (editor->stroke_options,
+                                         GIMP_DASH_CUSTOM, pattern);
 }
 
 static void
diff --git a/app/widgets/gimpstrokeeditor.c b/app/widgets/gimpstrokeeditor.c
index 9d2659c40d..ec094a4180 100644
--- a/app/widgets/gimpstrokeeditor.c
+++ b/app/widgets/gimpstrokeeditor.c
@@ -382,7 +382,7 @@ gimp_stroke_editor_dash_preset (GtkWidget         *widget,
   if (gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &value) &&
       value != GIMP_DASH_CUSTOM)
     {
-      gimp_stroke_options_set_dash_pattern (options, value, NULL);
+      gimp_stroke_options_take_dash_pattern (options, value, NULL);
     }
 }