[meld] Refactor the gconf testing slightly

[Kai Willadsen <kaiw src gnome org>]

commit 3316df640b95cb12cb06c9b48ded0e1e6e4dfb13
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Aug 30 07:08:53 2013 +1000

    Refactor the gconf testing slightly

 meld/util/prefs.py |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/meld/util/prefs.py b/meld/util/prefs.py
index 841b0f3..8cd616e 100644
--- a/meld/util/prefs.py
+++ b/meld/util/prefs.py
@@ -269,22 +269,21 @@ class ConfigParserPreferences(object):
         return "\n".join(prefs_entries)
 
 
+force_ini = os.path.exists(
+    os.path.join(glib.get_user_config_dir(), 'meld', 'use-rc-prefs'))
+skip_gconf = sys.platform == 'win32' or force_ini
 # Prefer gconf, falling back to configparser
-Preferences = None
-
-if sys.platform != 'win32' and not os.path.exists(os.path.join(glib.get_user_config_dir(), 'meld', 
'use-rc-prefs')):
-    try:
-        import gconf
-        # Verify that gconf is actually working (bgo#666136)
-        client = gconf.client_get_default()
-        key = '/apps/meld/gconf-test'
-        client.set_int(key, os.getpid())
-        client.unset(key)
-        Preferences = GConfPreferences
-    except (ImportError, glib.GError):
-        pass
-
-if Preferences == None:
+try:
+    if skip_gconf:
+        raise ImportError
+    import gconf
+    # Verify that gconf is actually working (bgo#666136)
+    client = gconf.client_get_default()
+    key = '/apps/meld/gconf-test'
+    client.set_int(key, os.getpid())
+    client.unset(key)
+    Preferences = GConfPreferences
+except (ImportError, glib.GError):
     try:
         import configparser
     except ImportError: