From 0c02bc423949c97cf361b8e340a2d1c9662ae66a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 7 Oct 2014 00:42:21 -0400
Subject: [PATCH] Inspector: Use the new monospace support

---
 gtk/inspector/css-editor.c   | 15 ---------------
 gtk/inspector/css-editor.ui  |  1 +
 gtk/inspector/python-shell.c |  8 +-------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c
index 69bf3902c6..0f032d03ef 100644
--- a/gtk/inspector/css-editor.c
+++ b/gtk/inspector/css-editor.c
@@ -206,20 +206,6 @@ save_clicked (GtkToolButton         *button,
   gtk_widget_show (dialog);
 }
 
-static void
-apply_system_font (GtkInspectorCssEditor *ce)
-{
-  GSettings *s = g_settings_new ("org.gnome.desktop.interface");
-  gchar *font_name = g_settings_get_string (s, "monospace-font-name");
-  PangoFontDescription *font_desc = pango_font_description_from_string (font_name);
-
-  gtk_widget_override_font (ce->priv->view, font_desc);
-
-  pango_font_description_free (font_desc);
-  g_free (font_name);
-  g_object_unref (s);
-}
-
 static void
 update_style (GtkInspectorCssEditor *ce)
 {
@@ -373,7 +359,6 @@ constructed (GObject *object)
   GtkInspectorCssEditor *ce = GTK_INSPECTOR_CSS_EDITOR (object);
 
   create_provider (ce);
-  apply_system_font (ce);
   set_initial_text (ce);
 }
 
diff --git a/gtk/inspector/css-editor.ui b/gtk/inspector/css-editor.ui
index baad7f8c4c..a61e4a1133 100644
--- a/gtk/inspector/css-editor.ui
+++ b/gtk/inspector/css-editor.ui
@@ -49,6 +49,7 @@
             <property name="visible">True</property>
             <property name="buffer">text</property>
             <property name="wrap-mode">word</property>
+            <property name="monospace">True</property>
           </object>
         </child>
       </object>
diff --git a/gtk/inspector/python-shell.c b/gtk/inspector/python-shell.c
index b52c723b32..cb5f08eb3f 100644
--- a/gtk/inspector/python-shell.c
+++ b/gtk/inspector/python-shell.c
@@ -75,7 +75,6 @@ gtk_inspector_python_shell_init (GtkInspectorPythonShell *python_shell)
     GtkWidget *swin;
     GtkTextBuffer *buffer;
     GtkTextIter iter;
-    PangoFontDescription *font_desc;
 
     python_shell->priv = gtk_inspector_python_shell_get_instance_private (python_shell);
 
@@ -92,6 +91,7 @@ gtk_inspector_python_shell_init (GtkInspectorPythonShell *python_shell)
                                         GTK_SHADOW_IN);
 
     python_shell->priv->textview = gtk_text_view_new();
+    gtk_text_view_set_monospace (GTK_TEXT_VIEW (python_shell->priv->textview), TRUE);
     gtk_widget_show(python_shell->priv->textview);
     gtk_container_add(GTK_CONTAINER(swin), python_shell->priv->textview);
     gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(python_shell->priv->textview), TRUE);
@@ -103,12 +103,6 @@ gtk_inspector_python_shell_init (GtkInspectorPythonShell *python_shell)
                      G_CALLBACK(gtk_inspector_python_shell_key_press_cb),
                      python_shell);
 
-    /* Make the textview monospaced */
-    font_desc = pango_font_description_from_string("monospace");
-    pango_font_description_set_size(font_desc, 8 * PANGO_SCALE);
-    gtk_widget_override_font(python_shell->priv->textview, font_desc);
-    pango_font_description_free(font_desc);
-
     /* Create the end-of-buffer mark */
     buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(python_shell->priv->textview));
     gtk_text_buffer_get_end_iter(buffer, &iter);