[meld] preferences: Get system font from GSettings



commit 0205ea315d77736582633a53ba4f811783c370f4
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Nov 14 07:35:22 2013 +1000

    preferences: Get system font from GSettings

 meld/preferences.py |    7 ++-----
 meld/settings.py    |    2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/meld/preferences.py b/meld/preferences.py
index e65be89..278d695 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -32,7 +32,7 @@ from .ui import gnomeglade
 from .ui import listwidget
 from .util import prefs
 
-from meld.settings import settings
+from meld.settings import settings, interface_settings
 
 
 TIMESTAMP_RESOLUTION_PRESETS = [('1ns (ext4)', 1),
@@ -373,10 +373,7 @@ class MeldPreferences(prefs.Preferences):
     def get_current_font(self):
         if self.use_custom_font:
             return self.custom_font
-        else:
-            if not hasattr(self, "_gconf"):
-                return "Monospace 10"
-            return self._gconf.get_string('/desktop/gnome/interface/monospace_font_name') or "Monospace 10"
+        return interface_settings.get_string('monospace-font-name')
 
     def get_toolbar_style(self):
         if not hasattr(self, "_gconf"):
diff --git a/meld/settings.py b/meld/settings.py
index 3ae36f5..3295b88 100644
--- a/meld/settings.py
+++ b/meld/settings.py
@@ -26,3 +26,5 @@ schema_source = Gio.SettingsSchemaSource.new_from_directory(
 )
 schema = schema_source.lookup('org.gnome.meld', False)
 settings = Gio.Settings.new_full(schema, None, None)
+
+interface_settings = Gio.Settings.new('org.gnome.desktop.interface')


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