fixx

3 files changed, 8 insertions, 4 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index ec6a4ec..a11fab3 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -7,6 +7,8 @@ Added to the list view (the list view is used in search dialog as well) the poss
 Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view.
 Added to the list view the possibility to add all subtodos of selected todos to an export/beam.
 Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout.
+Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus.
+Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly.
 
 ********** VERSION 2.1.5 ************
 
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 37e7d0d..d6e06c8 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -270,7 +270,7 @@ void  SimpleAlarmDaemonImpl::slotPlayBeep( int num )
 void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray&  )
 {
     //qDebug("SimpleAlarmDaemonImpl::ALARM RECEIVED! %s", msg.data()); 
-    QString mess = msg; 
+    QString mess = QString::fromUtf8(msg.data()); 
     mAlarmMessage = mess.mid( 9 ); 
     QString filename =  getenv("QPEDIR") ;
     filename += "/pics/kdepim/korganizer/koalarm.wav";
@@ -622,7 +622,7 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
 
     mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );
     timerMesssage = mess;
-    AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.latin1());
+    AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.utf8());
     mTimerTime = 1;
 }
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 8d992b9..4b82aa8 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -650,13 +650,15 @@ void CalendarView::checkAlarms()
     QPtrList<Incidence> el = mCalendar->rawIncidences(); 
     QPtrList<Incidence> al;
     Incidence* inL = el.first(); 
+    QDateTime cur = QDateTime::currentDateTime().addSecs(-59);
+    qDebug("KO: Checking alarm until %s ", cur.toString().latin1());
     while ( inL ) {  
         bool ok = false;
         int offset = 0;
         QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ;
         if ( ok ) {
             //qDebug("OK %s",next.toString().latin1());
-            if ( next < QDateTime::currentDateTime() ) {
+            if ( next < cur ) {
                 al.append( inL );
                 //qDebug("found missed alarm: %s ", inL->summary().latin1() );
             }
@@ -832,7 +834,7 @@ void CalendarView::addAlarm(const QDateTime &qdt, const QString &noti  )
     //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
     if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
 #ifndef DESKTOP_VERSION
-        AlarmServer::addAlarm ( qdt,"koalarm", noti.latin1() );
+        AlarmServer::addAlarm ( qdt,"koalarm", noti.utf8() );
 #endif     
         return;
     }