[meld] Change toolbar-style default to both-horiz to match recent Gnome

[Kai Willadsen <kaiw src gnome org>]

commit 1260fb0b435dbf91520f0519f76a82fc5c4587c3
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jan 1 08:26:07 2012 +1000

    Change toolbar-style default to both-horiz to match recent Gnome

 meld/preferences.py |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/meld/preferences.py b/meld/preferences.py
index d807e01..f27c230 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -268,14 +268,17 @@ class MeldPreferences(prefs.Preferences):
 
     def get_toolbar_style(self):
         if not hasattr(self, "_gconf"):
-            return gtk.TOOLBAR_BOTH
-        style = self._gconf.get_string('/desktop/gnome/interface/toolbar_style') or "both"
-        style = {"both":gtk.TOOLBAR_BOTH, "text":gtk.TOOLBAR_TEXT,
-                 "icon":gtk.TOOLBAR_ICONS, "icons":gtk.TOOLBAR_ICONS,
-                 "both_horiz":gtk.TOOLBAR_BOTH_HORIZ,
-                 "both-horiz":gtk.TOOLBAR_BOTH_HORIZ
-                 }[style]
-        return style
+            style = "both-horiz"
+        else:
+            style = self._gconf.get_string(
+                      '/desktop/gnome/interface/toolbar_style') or "both-horiz"
+        toolbar_styles = {
+            "both": gtk.TOOLBAR_BOTH, "text": gtk.TOOLBAR_TEXT,
+            "icon": gtk.TOOLBAR_ICONS, "icons": gtk.TOOLBAR_ICONS,
+            "both_horiz": gtk.TOOLBAR_BOTH_HORIZ,
+            "both-horiz": gtk.TOOLBAR_BOTH_HORIZ
+        }
+        return toolbar_styles[style]
 
     def get_editor_command(self, files, command_type=None):
         if command_type is None: