Ignore:
Timestamp:
03/21/12 21:42:02 (10 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
a9eca6f
Parents:
9a896cc
Message:

Hopefully fixed bug #38: As the alarm message was used to identify the event by setting it to the eventId and in r1359 the alarm message was changed to show the event title, alarms could not be deleted anymore. Therefore, two alarm attributes (int values) were introduced with this commit: "conferenceId" and "eventId" to identify the event and therefore, deleting alarms should work again. Additionally a second (not reported) bug was fixed: Activating an alarm in the treeview set the alarm to the current time plus 10 seconds.

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gui/eventdialog.cpp

    r9a896cc r11d3189  
    1919 */
    2020#include "eventdialog.h"
    21 #include <conference.h>
     21#include "conference.h"
    2222
    2323#include <QScrollBar>
    2424
    2525#ifdef MAEMO
    26 #include <alarm.h>
     26#include "alarm.h"
    2727#endif
    2828
     
    107107        // remove alarm from the 'alarmd' alrms list
    108108        Alarm alarm;
    109         alarm.deleteAlarm(event.id());
     109        alarm.deleteAlarm(event.conferenceId(), event.id());
    110110        // TODO: test if removing was successfull
    111111#endif /* MAEMO */
     
    118118        // add alarm to the 'alarmd'
    119119        Alarm alarm;
    120         int cookie = alarm.addAlarm(event.id(),event.title(),QDateTime::currentDateTime().addSecs(10));
     120        alarm.addAlarm(event.conferenceId(), event.id(), event.title(), event.start().addSecs(PRE_EVENT_ALARM_SEC));
    121121#endif /* MAEMO */
    122122    }
Note: See TracChangeset for help on using the changeset viewer.