Simplify code to disable highglight

andreldm · Jun 17, 2016 · 63ccbaa · 63ccbaa
1 parent 5ff0cd3
commit 63ccbaa
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
@@ -255,21 +255,21 @@ mousepad_view_buffer_changed (MousepadView *view,
     {
       GtkSourceStyleSchemeManager *manager;
       GtkSourceStyleScheme        *scheme;
-      const gchar *scheme_id;
-      gboolean disable_highlight;
+      gboolean enable_highlight = TRUE;
 
       manager = gtk_source_style_scheme_manager_get_default ();
       scheme = gtk_source_style_scheme_manager_get_scheme (manager,
         view->color_scheme ? view->color_scheme : "");
-      scheme_id = GTK_SOURCE_IS_STYLE_SCHEME (scheme) ?
-        gtk_source_style_scheme_get_id (scheme) : "none";
 
-      disable_highlight = (g_strcmp0 (scheme_id, "none") == 0);
-      if (disable_highlight)
-        scheme = gtk_source_style_scheme_manager_get_scheme (manager, "classic");
+      /* if schema is not valid (i.e. None) reset to classic and disable highlight */
+      if (!GTK_SOURCE_IS_STYLE_SCHEME (scheme))
+        {
+          scheme = gtk_source_style_scheme_manager_get_scheme (manager, "classic");
+          enable_highlight = FALSE;
+        }
 
       gtk_source_buffer_set_style_scheme (buffer, scheme);
-      gtk_source_buffer_set_highlight_syntax (buffer, !disable_highlight);
+      gtk_source_buffer_set_highlight_syntax (buffer, enable_highlight);
       gtk_source_buffer_set_highlight_matching_brackets (buffer, view->match_braces);
     }
 }