[gtksourceview] buffer: use g_set_object() in set_style_scheme()



commit 67e70f5731d7281e0b22b817f4d1980467036472
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Jun 12 14:09:43 2016 +0200

    buffer: use g_set_object() in set_style_scheme()
    
    To simplify the code.

 gtksourceview/gtksourcebuffer.c |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index 5e1dfc1..2c9de89 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -1879,25 +1879,17 @@ gtk_source_buffer_set_style_scheme (GtkSourceBuffer      *buffer,
        g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
        g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme) || scheme == NULL);
 
-       if (buffer->priv->style_scheme == scheme)
+       if (g_set_object (&buffer->priv->style_scheme, scheme))
        {
-               return;
-       }
-
-       if (buffer->priv->style_scheme != NULL)
-       {
-               g_object_unref (buffer->priv->style_scheme);
-       }
+               update_bracket_match_style (buffer);
 
-       buffer->priv->style_scheme = scheme != NULL ? g_object_ref (scheme) : NULL;
-       update_bracket_match_style (buffer);
+               if (buffer->priv->highlight_engine != NULL)
+               {
+                       _gtk_source_engine_set_style_scheme (buffer->priv->highlight_engine, scheme);
+               }
 
-       if (buffer->priv->highlight_engine != NULL)
-       {
-               _gtk_source_engine_set_style_scheme (buffer->priv->highlight_engine, scheme);
+               g_object_notify (G_OBJECT (buffer), "style-scheme");
        }
-
-       g_object_notify (G_OBJECT (buffer), "style-scheme");
 }
 
 /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]