[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/date
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2007-12-31 19:05:58
Message-ID: 1199127958.147304.26308.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 755241 by djarvie:

If the local time zone is defined by a non-zoneinfo file, add it to the
system time zones collection


 M  +10 -0     ksystemtimezone.cpp  


--- trunk/KDE/kdelibs/kdecore/date/ksystemtimezone.cpp #755240:755241
@@ -292,6 +292,16 @@
     {
         // The time zone is specified by a file outside the zoneinfo directory
         m_localZone = KTzfileTimeZone(KSystemTimeZonesPrivate::tzfileSource(), m_localZoneName);
+        if (m_localZone.isValid() && m_instance)
+        {
+            // Add the new time zone to the list
+            KTimeZone oldzone = m_instance->zone(m_localZoneName);
+            if (!oldzone.isValid() || oldzone.type() != "KTzfileTimeZone")
+            {
+                m_instance->remove(oldzone);
+                m_instance->add(m_localZone);
+            }
+        }
     }
     else
         m_localZone = m_instance->zone(m_localZoneName);
[prev in list] [next in list] [prev in thread] [next in thread]