Show event title instead of id in alarms.

diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp
index d5fa7fe27487b9d694c93e9561134214412be877..07c503b2ff9963dc1f640dbe44625dd12f8ddacc 100644 (file)
--- a/src/alarm/alarm.cpp
+++ b/src/alarm/alarm.cpp
@@ -29,7 +29,7 @@
 
 //#include <dbus-1.0/dbus/dbus-protocol.h>
 
-int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
+int Alarm::addAlarm(int aEventId, QString aEventTitle, const QDateTime &aDateTime)
 {
     cookie_t cookie = 0;
     alarm_event_t *eve = 0;
@@ -40,7 +40,9 @@ int Alarm::addAlarm(int aEventId, const QDateTime &aDateTime)
     alarm_event_set_alarm_appid(eve, APPID);
 
     /* for Deleting purposes */
-    alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data());
+    // ?!
+    //alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data());
+    alarm_event_set_message(eve, aEventTitle.toLocal8Bit().data());
 
     /* Use absolute time triggering */
     //eve->alarm_time = time(0) + 5; // for testing (5 seconds from now)

diff --git a/src/alarm/alarm.h b/src/alarm/alarm.h
index 9074c8e860d091cb403827e1619aedf6329850ca..e3cf5ec18cc978115071e33f1066d5d747d4717c 100644 (file)
--- a/src/alarm/alarm.h
+++ b/src/alarm/alarm.h
@@ -36,7 +36,7 @@ class Alarm : public QObject
     public:
         Alarm() {}
         ~Alarm() {}
-        int addAlarm(int aEventId, const QDateTime &aDateTime); 
+        int addAlarm(int aEventId, QString aEventTitle, const QDateTime &aDateTime); 
         void deleteAlarm(int aEventId);
         static bool hasEventAlarm(int aEventId);
     signals:

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index b4b590fdf700c8c590d569d9ec175a13d0c9b4e0..6fd700470f040fd3537f769db554d15b9ee46178 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -117,7 +117,7 @@ void EventDialog::alarmClicked()
 #ifdef MAEMO
         // add alarm to the 'alarmd'
         Alarm alarm;
-        int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10));
+        int cookie = alarm.addAlarm(event.id(),event.title(),QDateTime::currentDateTime().addSecs(10));
 #endif /* MAEMO */
     }
     event.update("alarm");

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 151fd8a697915c9f0775d387e5700b47e7feddad..88933514eb886b950a758dbf7a4bd2b9db7e2813 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -115,7 +115,7 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                     // add alarm to the 'alarmd'
                     Alarm alarm;
                     //int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10)); // testing
-                    int cookie = alarm.addAlarm(event.id(),event.start().addSecs(-15*60)); // 15 minutes before real start
+                    int cookie = alarm.addAlarm(event.id(),event.title(),event.start().addSecs(-15*60)); // 15 minutes before real start
 #endif /* MAEMO */
                 }
                 event.update("alarm");