Merge branch 'master' of https://git.maemo.org/projects/feedingit

[feedingit] / src / config.py

diff --git a/src/config.py b/src/config.py
index 2bb04f2..65fbddd 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -22,16 +22,17 @@
 # Version     : 0.6.1
 # Description : Simple RSS Reader
 # ============================================================================
-try:
-    import gtk
-    import hildon
-    from gobject import idle_add
-except:
-    pass
+#try:
+#    import gtk
+#    import hildon
+#    from gobject import idle_add
+#except:
+#    pass
 
 from ConfigParser import RawConfigParser
 from gconf import client_get_default
 from urllib2 import ProxyHandler
+from mainthread import mainthread
 
 VERSION = "52"
 
@@ -56,7 +57,9 @@ class Config():
         self.window.destroy()
 
     def createDialog(self):
-        
+        import gtk
+        import hildon
+        from gobject import idle_add
         self.window = gtk.Dialog("Settings", self.parent)
         self.window.set_geometry_hints(min_height=600)
 
@@ -173,6 +176,7 @@ class Config():
         self.saveConfig()
         
     def selection_changed(self, selector, button, setting):
+        from gobject import idle_add
         current_selection = selector.get_current_text()
         if current_selection:
             self.config[setting] = current_selection
@@ -243,6 +247,9 @@ class Config():
         file.close()
 
     def create_selector(self, choices, setting):
+        import gtk
+        import hildon
+        from gobject import idle_add
         #self.pickerDialog = hildon.PickerDialog(self.parent)
         selector = hildon.TouchSelector(text=True)
         index = 0
@@ -274,6 +281,7 @@ class Config():
         return ranges["orientation"].index(self.config["orientation"])
     def getImageCache(self):
         return self.config["imageCache"]
+    @mainthread
     def getProxy(self):
         if self.config["proxy"] == False:
             return (False, None)