add possible todo regarding mounted/ismount

[enigma2.git] / lib / python / Components / Timezones.py

diff --git a/lib/python/Components/Timezones.py b/lib/python/Components/Timezones.py
index 704b765e2b17deb2e47db097a1071e6f01f5689a..6e43aa21120c9e6d3d3367d6ffbf148a050e8999 100644 (file)
--- a/lib/python/Components/Timezones.py
+++ b/lib/python/Components/Timezones.py
@@ -4,8 +4,6 @@ from xml.sax.handler import ContentHandler
 import os
 import time
 
-from enigma import *
-
 class Timezones:
        class parseTimezones(ContentHandler):
                def __init__(self, timezones):
@@ -42,7 +40,8 @@ class Timezones:
                try:
                        time.tzset()
                except:
-                       etimezone()
+                       from enigma import e_tzset
+                       e_tzset()
                
        def getTimezoneList(self):
                list = []
@@ -52,6 +51,10 @@ class Timezones:
        
        def getDefaultTimezone(self):
                # TODO return something more useful - depending on country-settings?
-               return "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Vienna"
+               t = "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Vienna"
+               for (a,b) in self.timezones:
+                       if a == t:
+                               return a
+               return self.timezones[0][0]
 
 timezones = Timezones()