[meld] meldwindow: Bind toolbar style to system dconf setting

[Kai Willadsen <kaiw src gnome org>]

commit 24a9b78d01b4c51d83fe2f6b178dbb7d14e33e50
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Nov 23 10:44:35 2013 +1000

    meldwindow: Bind toolbar style to system dconf setting

 meld/meldwindow.py  |    6 +++++-
 meld/preferences.py |   14 --------------
 2 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 6ea84ca..d411e95 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -38,6 +38,8 @@ from .ui import notebooklabel
 from .util.compat import string_types
 from .meldapp import app
 
+from meld.settings import interface_settings
+
 
 class MeldWindow(gnomeglade.Component):
 
@@ -165,6 +167,9 @@ class MeldWindow(gnomeglade.Component):
         self.menubar = self.ui.get_widget('/Menubar')
         self.toolbar = self.ui.get_widget('/Toolbar')
 
+        interface_settings.bind('toolbar-style', self.toolbar, 'toolbar-style',
+                                Gio.SettingsBindFlags.DEFAULT)
+
         # Add alternate keybindings for Prev/Next Change
         accels = self.ui.get_accel_group()
         (keyval, mask) = Gtk.accelerator_parse("<Ctrl>D")
@@ -188,7 +193,6 @@ class MeldWindow(gnomeglade.Component):
         self.widget.drag_dest_add_uri_targets()
         self.widget.connect("drag_data_received",
                             self.on_widget_drag_data_received)
-        self.toolbar.set_style(app.prefs.get_toolbar_style())
         self.toolbar.props.visible = app.prefs.toolbar_visible
         self.statusbar.props.visible = app.prefs.statusbar_visible
         app.prefs.notify_add(self.on_preference_changed)
diff --git a/meld/preferences.py b/meld/preferences.py
index 025a8e4..a0f8164 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -379,20 +379,6 @@ class MeldPreferences(prefs.Preferences):
             return self.custom_font
         return interface_settings.get_string('monospace-font-name')
 
-    def get_toolbar_style(self):
-        if not hasattr(self, "_gconf"):
-            style = "both-horiz"
-        else:
-            style = self._gconf.get_string(
-                      '/desktop/gnome/interface/toolbar_style') or "both-horiz"
-        toolbar_styles = {
-            "both": Gtk.ToolbarStyle.BOTH, "text": Gtk.ToolbarStyle.TEXT,
-            "icon": Gtk.ToolbarStyle.ICONS, "icons": Gtk.ToolbarStyle.ICONS,
-            "both_horiz": Gtk.ToolbarStyle.BOTH_HORIZ,
-            "both-horiz": Gtk.ToolbarStyle.BOTH_HORIZ
-        }
-        return toolbar_styles[style]
-
     def get_editor_command(self, path, line=0):
         if self.edit_command_type == "custom":
             custom_command = self.edit_command_custom