Hopefully fixed bug #38: As the alarm message was used to identify the event by setti...

However, I don't know for sure whether this commit fixed bug #38 becaus I don't have a maemo device to test it.

diff --git a/src/alarm/alarm.cpp b/src/alarm/alarm.cpp
index 07c503b2ff9963dc1f640dbe44625dd12f8ddacc..adeea77d054ddc16994002746a1fe5db87291361 100644 (file)
--- a/src/alarm/alarm.cpp
+++ b/src/alarm/alarm.cpp
@@ -29,41 +29,40 @@
 
 //#include <dbus-1.0/dbus/dbus-protocol.h>
 
-int Alarm::addAlarm(int aEventId, QString aEventTitle, const QDateTime &aDateTime)
-{
-    cookie_t cookie = 0;
-    alarm_event_t *eve = 0;
-    alarm_action_t *act = 0;
+int Alarm::addAlarm(int conferenceId, int eventId, QString eventTitle, const QDateTime &alarmDateTime) {
+    cookie_t alarmCookie = 0;
+    alarm_event_t *alarmEvent = 0;
+    alarm_action_t *alarmAction = 0;
 
     /* Create alarm event structure and set application identifier */
-    eve = alarm_event_create();
-    alarm_event_set_alarm_appid(eve, APPID);
+    alarmEvent = alarm_event_create();
+    alarm_event_set_alarm_appid(alarmEvent, APPID);
 
-    /* for Deleting purposes */
-    // ?!
-    //alarm_event_set_message(eve, QString::number(aEventId).toLocal8Bit().data());
-    alarm_event_set_message(eve, aEventTitle.toLocal8Bit().data());
+    // message
+    alarm_event_set_title(alarmEvent, "ConfClerk");
+    alarm_event_set_message(alarmEvent, eventTitle.toLocal8Bit().data());
+
+    // for deleting purposes
+    alarm_event_set_attr_int(alarmEvent, "conferenceId", conferenceId);
+    alarm_event_set_attr_int(alarmEvent, "eventId", eventId);
 
     /* Use absolute time triggering */
-    //eve->alarm_time = time(0) + 5; // for testing (5 seconds from now)
-    QDateTime local( aDateTime);
-    qDebug() << "UTC: " << local.toTime_t();
+    QDateTime local(alarmDateTime);
     local.setTimeSpec(Qt::LocalTime);
-    qDebug() << "LocalTime: " << local.toTime_t();
 
-    eve->alarm_time = local.toTime_t();
-    eve->flags = ALARM_EVENT_BOOT;
+    alarmEvent->alarm_time = local.toTime_t();
+    alarmEvent->flags = ALARM_EVENT_BOOT;
 
     /* Add exec command action */
-    act = alarm_event_add_actions(eve, 1);
-    alarm_action_set_label(act, "ConfClerk");
+    alarmAction = alarm_event_add_actions(alarmEvent, 1);
+    alarm_action_set_label(alarmAction, "ConfClerk");
 
-    QString command = QFileInfo(*qApp->argv()).absoluteFilePath() + QString(" %1").arg(QString::number(aEventId));
+    QString command = QFileInfo(*qApp->argv()).absoluteFilePath() + QString(" %1").arg(QString::number(eventId));
     qDebug() << "Setting alarm: " << command;
-    alarm_action_set_exec_command(act, command.toLocal8Bit().data());
-    act->flags |= ALARM_ACTION_TYPE_EXEC;
-    act->flags |= ALARM_ACTION_WHEN_RESPONDED;
-    act->flags |= ALARM_ACTION_EXEC_ADD_COOKIE; // adds assigned cookie at the end of command string
+    alarm_action_set_exec_command(alarmAction, command.toLocal8Bit().data());
+    alarmAction->flags |= ALARM_ACTION_TYPE_EXEC;
+    alarmAction->flags |= ALARM_ACTION_WHEN_RESPONDED;
+    alarmAction->flags |= ALARM_ACTION_EXEC_ADD_COOKIE; // adds assigned cookie at the end of command string
 
 //    // setup this action to be a "DBus command"
 //    act->flags |= ALARM_ACTION_WHEN_RESPONDED;
@@ -87,115 +86,43 @@ int Alarm::addAlarm(int aEventId, QString aEventTitle, const QDateTime &aDateTim
 
     /* Add stop button action */
     /* TODO: send a DBus message to remove that alarm from database */
-    act = alarm_event_add_actions(eve, 1);
-    alarm_action_set_label(act, "Stop");
-    act->flags |= ALARM_ACTION_WHEN_RESPONDED;
-    act->flags |= ALARM_ACTION_TYPE_NOP;
+    alarmAction = alarm_event_add_actions(alarmEvent, 1);
+    alarm_action_set_label(alarmAction, "Stop");
+    alarmAction->flags |= ALARM_ACTION_WHEN_RESPONDED;
+    alarmAction->flags |= ALARM_ACTION_TYPE_NOP;
 
     /* Add snooze button action */
-    act = alarm_event_add_actions(eve, 1);
-    alarm_action_set_label(act, "Snooze");
-    act->flags |= ALARM_ACTION_WHEN_RESPONDED;
-    act->flags |= ALARM_ACTION_TYPE_SNOOZE;
+    alarmAction = alarm_event_add_actions(alarmEvent, 1);
+    alarm_action_set_label(alarmAction, "Snooze");
+    alarmAction->flags |= ALARM_ACTION_WHEN_RESPONDED;
+    alarmAction->flags |= ALARM_ACTION_TYPE_SNOOZE;
 
     /* Send the alarm to alarmd */
-    cookie = alarmd_event_add(eve);
-
-    // adding alarm failed
-    if (cookie == 0)
-        emit(addAlarmFailed(aEventId));
-    else
-        emit(alarmAdded(aEventId));
+    alarmCookie = alarmd_event_add(alarmEvent);
 
     /* Free all dynamic memory associated with the alarm event */
-    alarm_event_delete(eve);
+    alarm_event_delete(alarmEvent);
 
-    return cookie;
+    return alarmCookie;
 }
 
-void Alarm::deleteAlarm(int aEventId)
-{
-    cookie_t *list = 0;
-    cookie_t cookie = 0;
-    alarm_event_t *event = 0;
+void Alarm::deleteAlarm(int conferenceId, int eventId) {
+    cookie_t *alarmList = 0;
+    cookie_t alarmCookie = 0;
+    alarm_event_t *alarmEvent = 0;
 
     // query the APPID's list of alarms
-    if( (list = alarmd_event_query(0,0, 0,0, APPID)) != 0 ) // query OK
-    {
-        for( int i = 0; (cookie = list[i]) != 0; ++i )
-        {
-            alarm_event_delete(event);
-
+    if( (alarmList = alarmd_event_query(0,0, 0,0, APPID)) != 0) { // query OK
+        for (int i = 0; (alarmCookie = alarmList[i]) != 0; ++i ) {
             // get the event for specified alarm cookie (alarmId)
-            if( (event = alarmd_event_get(cookie)) == 0 )
-            {
-                // should we inform user about it ???
-                continue;
-            }
-
-            if(aEventId==atoi(alarm_event_get_message(event)))
-            {
-                // delete cookie
-                if( alarmd_event_del(cookie) == -1 )
-                {
-                    // was not able to delete alarm for given aEventId
-                    emit(deleteAlarmFailed(aEventId));
-                    break;
-                }
-                else
-                {
-                    emit(alarmDeleted(aEventId));
-                    break;
-                }
-            }
-        }
-    }
-    else
-    {
-        // query failed
-    }
-
-    free(list);
-    alarm_event_delete(event);
-}
-
-bool Alarm::hasEventAlarm(int aEventId)
-{
-    cookie_t *list = 0;
-    cookie_t cookie = 0;
-    alarm_event_t *event = 0;
+            alarmEvent = alarmd_event_get(alarmCookie);
+            Q_ASSERT(alarmEvent);
 
-    bool eventHasAlarm = false;
-
-    // query the APPID's list of alarms
-    if( (list = alarmd_event_query(0,0, 0,0, APPID)) != 0 ) // query OK
-    {
-        for( int i = 0; (cookie = list[i]) != 0; ++i )
-        {
-            alarm_event_delete(event);
-
-            // get the event for specified alarm cookie (alarmId)
-            if( (event = alarmd_event_get(cookie)) == 0 )
-            {
-                // should we inform user about it ???
-                continue;
-            }
-
-            if(aEventId==atoi(alarm_event_get_message(event)))
-            {
-                eventHasAlarm = true;
-                break;
-            }
+            bool found = (conferenceId == alarm_event_get_attr_int(alarmEvent, "conferenceId", -1) && eventId == alarm_event_get_attr_int(alarmEvent, "eventId", -1));
+            if (found) alarmd_event_del(alarmCookie); // delete cookie
+            alarm_event_delete(alarmEvent);
+            if (found) break;
         }
     }
-    else
-    {
-        // query failed
-    }
-
-    free(list);
-    alarm_event_delete(event);
-
-    return eventHasAlarm;
+    free(alarmList);
 }
-

diff --git a/src/alarm/alarm.h b/src/alarm/alarm.h
index e3cf5ec18cc978115071e33f1066d5d747d4717c..aea42588c6b2831710626383b1fb740499b2514a 100644 (file)
--- a/src/alarm/alarm.h
+++ b/src/alarm/alarm.h
@@ -28,7 +28,8 @@ extern "C"
 #include <alarmd/libalarm.h>
 }
 
-#define APPID "fosdem-alarm"
+#define APPID "confclerk-alarm"
+const int PRE_EVENT_ALARM_SEC = -15*60; // alarm goes off 15 minutes before start of event
 
 class Alarm : public QObject
 {
@@ -36,14 +37,8 @@ class Alarm : public QObject
     public:
         Alarm() {}
         ~Alarm() {}
-        int addAlarm(int aEventId, QString aEventTitle, const QDateTime &aDateTime); 
-        void deleteAlarm(int aEventId);
-        static bool hasEventAlarm(int aEventId);
-    signals:
-        void alarmAdded(int aEventId);
-        void addAlarmFailed(int aEventId);
-        void alarmDeleted(int aEventId);
-        void deleteAlarmFailed(int aEventId);
+        int addAlarm(int conferenceId, int eventId, QString eventTitle, const QDateTime& alarmDateTime);
+        void deleteAlarm(int conferenceId, int eventId);
 };
 
 #endif /* ALARM_H */

diff --git a/src/gui/conflictdialogcontainer.cpp b/src/gui/conflictdialogcontainer.cpp
index c04bc3e4980bbd89d7079ecb5e3c9f3f8d7bbe8c..512845f4a250db8a2ac87359097d260c319a06fb 100644 (file)
--- a/src/gui/conflictdialogcontainer.cpp
+++ b/src/gui/conflictdialogcontainer.cpp
@@ -40,6 +40,7 @@ void ConflictDialogContainer::loadEvents() {
 
 void ConflictDialogContainer::loadEvents(const QDate &aDate, const int aConferenceId) {
     Q_UNUSED(aDate);
+    Q_UNUSED(aConferenceId);
     Q_ASSERT(aConferenceId == mConferenceId);
     Q_ASSERT(mConferenceId > 0);
     Q_ASSERT(mEventId > 0);

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index ee749371b0515e54ff7a0548032da25406974939..84409f4af02ca9d7b13a7d604e95ea84d71d5ba8 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -18,12 +18,12 @@
  * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "eventdialog.h"
-#include <conference.h>
+#include "conference.h"
 
 #include <QScrollBar>
 
 #ifdef MAEMO
-#include <alarm.h>
+#include "alarm.h"
 #endif
 
 EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
@@ -106,7 +106,7 @@ void EventDialog::alarmClicked()
 #ifdef MAEMO
         // remove alarm from the 'alarmd' alrms list
         Alarm alarm;
-        alarm.deleteAlarm(event.id());
+        alarm.deleteAlarm(event.conferenceId(), event.id());
         // TODO: test if removing was successfull
 #endif /* MAEMO */
     }
@@ -117,7 +117,7 @@ void EventDialog::alarmClicked()
 #ifdef MAEMO
         // add alarm to the 'alarmd'
         Alarm alarm;
-        int cookie = alarm.addAlarm(event.id(),event.title(),QDateTime::currentDateTime().addSecs(10));
+        alarm.addAlarm(event.conferenceId(), event.id(), event.title(), event.start().addSecs(PRE_EVENT_ALARM_SEC));
 #endif /* MAEMO */
     }
     event.update("alarm");

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 57de75217f31923e21520cc482b044ac7510ceee..636ea986474feac904291fd23b11eb848ad1bc73 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -26,7 +26,7 @@
 #include "eventmodel.h"
 
 #ifdef MAEMO
-#include <alarm.h>
+#include "alarm.h"
 #endif
 
 #include <QDebug>
@@ -101,8 +101,7 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
 #ifdef MAEMO
                     // remove alarm from the 'alarmd' alrms list
                     Alarm alarm;
-                    alarm.deleteAlarm(event.id());
-                    // TODO: test if removing was successfull
+                    alarm.deleteAlarm(event.conferenceId(), event.id());
 #endif /* MAEMO */
                 }
                 else
@@ -111,8 +110,7 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
 #ifdef MAEMO
                     // 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.title(),event.start().addSecs(-15*60)); // 15 minutes before real start
+                    alarm.addAlarm(event.conferenceId(), event.id(), event.title(),event.start().addSecs(PRE_EVENT_ALARM_SEC));
 #endif /* MAEMO */
                 }
                 event.update("alarm");