summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-04 18:24:25 (UTC)
committer zautrix <zautrix>2005-04-04 18:24:25 (UTC)
commitff205358654ed8741f0008eabd64a0e8b0476b61 (patch) (side-by-side diff)
tree52844c5c14286c463fc11b132b6d92cd6d72c96c
parent13fa1e5e1d5e4663bbbc79e0c68caf725ad2e31b (diff)
downloadkdepimpi-ff205358654ed8741f0008eabd64a0e8b0476b61.zip
kdepimpi-ff205358654ed8741f0008eabd64a0e8b0476b61.tar.gz
kdepimpi-ff205358654ed8741f0008eabd64a0e8b0476b61.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagenda.cpp1
-rw-r--r--korganizer/koagendaview.cpp3
-rw-r--r--libkcal/calendarlocal.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index de964da..b5d52d2 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -389,2 +389,3 @@ void KOAgenda::popupMenu()
if (mPopupItem) {
+ //mClickedItem = mPopupItem;
selectItem(mPopupItem);
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 6d1e6d5..20a5b74 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -466,2 +466,3 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
+#if 0
mAllAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
@@ -470,3 +471,3 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
-
+#endif
connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 5c889c3..00a43e5 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -300,3 +300,2 @@ void CalendarLocal::checkAlarmForIncidence( Incidence * incidence, bool deleted
//QDateTime nextEvent;
- mNextAlarmEventDateTime = QDateTime();
if ( mNextAlarmIncidence == 0 || incidence == 0 ) {
@@ -376,2 +375,3 @@ void CalendarLocal::deRegisterAlarm()
emit removeAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString );
+ mNextAlarmEventDateTime = QDateTime();
// #ifndef DESKTOP_VERSION