alarm UTC/localtime fix

diff --git a/data/maemo/fosdem-schedule.desktop b/data/maemo/fosdem-schedule.desktop
index 6339f7097967b38930077e8dca46073cf5f816ab..e3621d7aa07be3e3b513be125ed64ea53f3fa7fb 100644 (file)
--- a/data/maemo/fosdem-schedule.desktop
+++ b/data/maemo/fosdem-schedule.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=0.3
+Version=0.4
 Type=Application
 Name=FOSDEM'10
 Exec=/usr/bin/fosdem-schedule

diff --git a/debian/changelog b/debian/changelog
index e56ab6bc185a1ce658a033f99725464f481d643a..663230da465f96b9ff647071fb690a00ed9f3827 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
-fosdem-schedule (0.3) stable; urgency=low
+fosdem-schedule (0.4) stable; urgency=low
+  
+  * Release 0.4
+       
+ -- Marek Timko <marek.timko@ixonos.com>  Tue, 5 Feb 2010 16:40:26 +0100
 
   * Release 0.3
        

diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp
index 0cfb31b4052de74d52a1e46e6fe83d4193eabf73..006fc79f0d9db8732643ebac08b1211cbd77fb34 100644 (file)
--- a/src/alarm/alarm.cpp
+++ b/src/alarm/alarm.cpp
@@ -43,7 +43,12 @@ int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
 
     /* Use absolute time triggering */
     //eve->alarm_time = time(0) + 5; // for testing (5 seconds from now)
-    eve->alarm_time = aDateTime.toTime_t();
+    QDateTime local( aDateTime);
+    qDebug() << "UTC: " << local.toTime_t();
+    local.setTimeSpec(Qt::LocalTime);
+    qDebug() << "LocalTime: " << local.toTime_t();
+    
+    eve->alarm_time = local.toTime_t();
     eve->flags = ALARM_EVENT_BOOT;
 
     /* Add exec command action */

diff --git a/src/gui/about.ui b/src/gui/about.ui
index 28ceb880caab69b5c7cb3d8d55c5ffac2ee49146..cae3f28b30a4328a4c1e786adfd48171a9720589 100644 (file)
--- a/src/gui/about.ui
+++ b/src/gui/about.ui
@@ -187,7 +187,7 @@
               <item>
                <widget class="QLabel" name="label_2" >
                 <property name="text" >
-                 <string>Version 0.3</string>
+                 <string>Version 0.4</string>
                 </property>
                </widget>
               </item>