[goffice] GogLineSeries: fix marker problem.

[Morten Welinder <mortenw src gnome org>]

commit c0960a5da08eab1f943e8a886e7d8a01ab2852ce
Author: Morten Welinder <terra gnome org>
Date:   Wed Feb 4 14:03:23 2015 -0500

    GogLineSeries: fix marker problem.

 ChangeLog                      |    5 +++++
 NEWS                           |    3 +++
 plugins/plot_barcol/gog-line.c |    2 +-
 3 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a6ed697..bea2c76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-04  Morten Welinder  <terra gnome org>
+
+       * plugins/plot_barcol/gog-line.c (gog_line_series_init_style):
+       Don't wipe out marker colours just because the shape auto.
+
 2015-01-26  Jean Brefort  <jean brefort normalesup org>
 
        * plugins/reg_linear/gog-lin-reg.c: ensure that the dims number is correct
diff --git a/NEWS b/NEWS
index ac83e8d..bc5332f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ goffice 0.10.20:
 Jean:
        * Ensure the validity of the dims property for linear regression curves.
 
+Morten:
+       * Fix marker problem with line plots.
+
 --------------------------------------------------------------------------
 goffice 0.10.19:
 
diff --git a/plugins/plot_barcol/gog-line.c b/plugins/plot_barcol/gog-line.c
index a0348ec..cb9e5cf 100644
--- a/plugins/plot_barcol/gog-line.c
+++ b/plugins/plot_barcol/gog-line.c
@@ -359,7 +359,7 @@ gog_line_series_init_style (GogStyledObject *gso, GOStyle *style)
        if (!plot->default_style_has_markers) {
                style->disable_theming |= GO_STYLE_MARKER;
                if (style->marker.auto_shape) {
-                       GOMarker *m = go_marker_new ();
+                       GOMarker *m = go_marker_dup (style->marker.mark);
                        go_marker_set_shape (m, GO_MARKER_NONE);
                        go_style_set_marker (style, m);
                }