1 files changed, 26 insertions, 21 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index fd026fa..70a1d2d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -785,3 +785,3 @@ void  CalendarView::startAlarm( QString mess , QString filename)
     mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount );
-    QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) );
+    QTimer::singleShot( 2000, this, SLOT( checkNextTimerAlarm() ) );
 
@@ -928,3 +928,7 @@ void CalendarView::recheckTimerAlarm()
 }
+#ifndef DESKTOP_VERSION
 void CalendarView::removeAlarm(const QDateTime &qdt, const QString &noti  )
+#else
+void CalendarView::removeAlarm(const QDateTime &, const QString &  )
+#endif
 {
@@ -933,3 +937,3 @@ void CalendarView::removeAlarm(const QDateTime &qdt, const QString &noti  )
 #ifndef DESKTOP_VERSION
-        AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() );
+        AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.utf8() );
 #endif   
@@ -1212,3 +1216,2 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     int take;
-    Event* eventL;
     Event* eventRSync;
@@ -2312,3 +2315,8 @@ void CalendarView::readSettings()
 
-
+void CalendarView::checkSuspendAlarm()
+{
+    if ( mSuspendTimer->isActive() ) {
+        KMessageBox::information( this, i18n("<b>WARNING:</b> There is a pending suspended alarm!"), i18n("Pending Suspend Alarm"));
+    }
+}
 void CalendarView::writeSettings()
@@ -2316,3 +2324,3 @@ void CalendarView::writeSettings()
     //  kdDebug() << "CalendarView::writeSettings" << endl;
-
+   
     KConfig *config = KOGlobals::config();
@@ -2796,4 +2804,3 @@ void CalendarView::removeCategories()
     Incidence* inc = incList.first();
-    int i;
-    int count = 0;
+    uint i;
     while ( inc ) {
@@ -2817,3 +2824,3 @@ int CalendarView::addCategories()
     Incidence* inc = incList.first();
-    int i;
+    uint i;
     int count = 0;
@@ -2947,7 +2954,7 @@ void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
 }
+
+#ifndef DESKTOP_VERSION
 void  CalendarView::beamDone( Ir *ir )
 {
-#ifndef DESKTOP_VERSION
     delete ir;
-#endif
     topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
@@ -2955,3 +2962,5 @@ void  CalendarView::beamDone( Ir *ir )
 }
-
+#else 
+void  CalendarView::beamDone( Ir *){;}
+#endif
 void CalendarView::moveIncidence(Incidence * inc ) 
@@ -4309,7 +4318,2 @@ Todo *CalendarView::selectedTodo()
 
-void CalendarView::dialogClosing(Incidence *in)
-{
-    // mDialogList.remove(in);
-}
-
 void CalendarView::showIncidence()
@@ -4434,6 +4438,3 @@ void CalendarView::purgeCompleted()
         //QPtrList<Incidence> rel;
-        Todo *aTodo;//, *rTodo;
-        Incidence *rIncidence;
-        bool childDelete = false;
-        bool deletedOne = true;
+        Todo *aTodo;
         todoCal = calendar()->todos();
@@ -4465,3 +4466,5 @@ bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
 {
-    // mSyncManager = manager;
+   
+    if ( manager != mSyncManager)
+        qDebug("KO: Internal error-1. SyncManager mismatch ");
     if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
@@ -4476,2 +4479,4 @@ bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
     //mSyncManager = manager;
+    if ( manager != mSyncManager)
+        qDebug("KO: Internal error-2. SyncManager mismatch ");
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();