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
@@ -782,9 +782,9 @@ void  CalendarView::startAlarm( QString mess , QString filename)
     topLevelWidget()->setActiveWindow();
     topLevelWidget()->raise(); 
 
     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() ) );
 
 }
     
 void CalendarView::checkNextTimerAlarm()
@@ -925,14 +925,18 @@ void CalendarView::recheckTimerAlarm()
     mAlarmTimer->stop();
     mRecheckAlarmTimer->stop();
     mCalendar->checkAlarmForIncidence( 0, true );
 }
+#ifndef DESKTOP_VERSION
 void CalendarView::removeAlarm(const QDateTime &qdt, const QString &noti  )
+#else
+void CalendarView::removeAlarm(const QDateTime &, const QString &  )
+#endif
 {
     //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
     if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
 #ifndef DESKTOP_VERSION
-        AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() );
+        AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.utf8() );
 #endif   
         return;
     }
     mAlarmTimer->stop();
@@ -1209,9 +1213,8 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     //QPtrList<Event> el = local->rawEvents(); 
     Event* eventR;
     QString uid;
     int take;
-    Event* eventL;
     Event* eventRSync;
     Event* eventLSync;
     clearAllViews();
     QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
@@ -2309,13 +2312,18 @@ void CalendarView::readSettings()
     mViewManager->readSettings( config );
     QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) );
 }
 
-
+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()
 {
     //  kdDebug() << "CalendarView::writeSettings" << endl;
-
+   
     KConfig *config = KOGlobals::config();
 
     mViewManager->writeSettings( config );
     mTodoList->saveLayout(config,QString("Todo Layout"));
@@ -2793,10 +2801,9 @@ void CalendarView::removeCategories()
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     QStringList newCatList;
     Incidence* inc = incList.first();
-    int i;
-    int count = 0;
+    uint i;
     while ( inc ) {
         newCatList.clear();
         catIncList =  inc->categories() ;
         for( i = 0; i<   catIncList.count(); ++i ) {
@@ -2814,9 +2821,9 @@ int CalendarView::addCategories()
     QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     Incidence* inc = incList.first();
-    int i;
+    uint i;
     int count = 0;
      while ( inc ) {
         catIncList = inc->categories() ;
         for( i = 0; i<   catIncList.count(); ++i ) {
@@ -2944,17 +2951,19 @@ void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
         ir->send( fn, description, "text/x-vCalendar" );
 #endif
     }
 }
+
+#ifndef DESKTOP_VERSION
 void  CalendarView::beamDone( Ir *ir )
 {
-#ifndef DESKTOP_VERSION
     delete ir;
-#endif
     topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
     topLevelWidget()->raise();
 }
-
+#else 
+void  CalendarView::beamDone( Ir *){;}
+#endif
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
     if ( !inc ) return;
     showDatePickerPopup(); 
@@ -4306,13 +4315,8 @@ Todo *CalendarView::selectedTodo()
 
     return 0;
 }
 
-void CalendarView::dialogClosing(Incidence *in)
-{
-    // mDialogList.remove(in);
-}
-
 void CalendarView::showIncidence()
 {
     mViewerCallerIsSearchDialog = false;
     Incidence *incidence = currentSelection();
@@ -4431,12 +4435,9 @@ void CalendarView::purgeCompleted()
 
         QPtrList<Todo> todoCal;
         QPtrList<Todo> rootTodos;
         //QPtrList<Incidence> rel;
-        Todo *aTodo;//, *rTodo;
-        Incidence *rIncidence;
-        bool childDelete = false;
-        bool deletedOne = true;
+        Todo *aTodo;
         todoCal = calendar()->todos();
         for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) {
             if ( !aTodo->relatedTo() )
                 rootTodos.append( aTodo );
@@ -4462,9 +4463,11 @@ void CalendarView::keyPressEvent ( QKeyEvent *e)
 
 
 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" ) {
         qDebug("KO: SyncKDE request detected!");
     }
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
@@ -4473,8 +4476,10 @@ bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
 }
 bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
 {
     //mSyncManager = manager;
+    if ( manager != mSyncManager)
+        qDebug("KO: Internal error-2. SyncManager mismatch ");
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
     if ( resource == "sharp" )
         syncExternal( 0 );