[gtksourceview] view: verify that a color is set in a GtkSourceStyle

[Sébastien Wilmet <swilmet src gnome org>]

commit 157c6caed1a269fbcea27369b2bf7bd7c11a1c64
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Jun 19 15:58:26 2016 +0200

    view: verify that a color is set in a GtkSourceStyle
    
    The -set property was checked in update_right_margin_colors() but not in
    update_spaces_color(). Make the code consistent.

 gtksourceview/gtksourceview.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index 827dd0f..2b8332a 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -5062,11 +5062,13 @@ update_right_margin_colors (GtkSourceView *view)
                        GdkRGBA color;
 
                        g_object_get (style,
-                                     "foreground-set", &color_set,
                                      "foreground", &color_str,
+                                     "foreground-set", &color_set,
                                      NULL);
 
-                       if (color_set && (color_str != NULL) && gdk_rgba_parse (&color, color_str))
+                       if (color_set &&
+                           color_str != NULL &&
+                           gdk_rgba_parse (&color, color_str))
                        {
                                view->priv->right_margin_line_color = gdk_rgba_copy (&color);
                                view->priv->right_margin_line_color->alpha =
@@ -5077,11 +5079,13 @@ update_right_margin_colors (GtkSourceView *view)
                        color_str = NULL;
 
                        g_object_get (style,
-                                     "background-set", &color_set,
                                      "background", &color_str,
+                                     "background-set", &color_set,
                                      NULL);
 
-                       if (color_set && (color_str != NULL) && gdk_rgba_parse (&color, color_str))
+                       if (color_set &&
+                           color_str != NULL &&
+                           gdk_rgba_parse (&color, color_str))
                        {
                                view->priv->right_margin_overlay_color = gdk_rgba_copy (&color);
                                view->priv->right_margin_overlay_color->alpha =
@@ -5136,13 +5140,17 @@ update_spaces_color (GtkSourceView *view)
                if (style != NULL)
                {
                        gchar *color_str = NULL;
+                       gboolean color_set;
                        GdkRGBA color;
 
                        g_object_get (style,
                                      "foreground", &color_str,
+                                     "foreground-set", &color_set,
                                      NULL);
 
-                       if (color_str != NULL && gdk_rgba_parse (&color, color_str))
+                       if (color_set &&
+                           color_str != NULL &&
+                           gdk_rgba_parse (&color, color_str))
                        {
                                view->priv->spaces_color = gdk_rgba_copy (&color);
                        }