11 files changed, 47 insertions, 15 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 54376a0..10778ac 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -10,4 +10,9 @@ Added option for a journal title.
 Added info about the calendar, the item belongs to, to the event/todo/journal viewer. 
 
+
+Fixed some problems when calling KO/Pi or KA/Pi from the alarm applet.
+
+Added KA/Pi multi sync to the multi sync called from the alarm applet.
+ 
 ********** VERSION 2.1.10 ************
 
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 515161f..c18a241 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -258,10 +258,10 @@
 { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" },

 { "Disable Pi-Sync","Schalte Pi-Sync aus" },

-{ "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen \"Multi-Syncen\"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },

+{ "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen "Multi-Syncen"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },

 { "KDE-Pim Sync","KDE-Pim Sync" },

 { "Multiple profiles","Multi-Sync Profile" },

 { "Device: ","Gerät: " },

 { "Multiple sync started.","Multi-Sync gestartet." },

-{ "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert für Multi-Sync" },

+{ "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile selektiert für Multi-Sync" },

 { "KDE-Pim sync config","KDE-Pim Sync Konfig" },

 { "Insert kind of connection,e.g.:\n","Füge Art der Verbindung ein, z.B.:\n" },

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 510f4bf..792cb91 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -969,5 +969,5 @@
 { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" },
 { "Disable Pi-Sync","Schalte Pi-Sync aus" },
-{ "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen \"Multi-Syncen\"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
+{ "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen "Multi-Syncen"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
 { "KDE-Pim Sync","KDE-Pim Sync" },
 { "Multiple profiles","Multi-Sync Profile" },
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index bd32859..5334a0e 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -660,5 +660,5 @@ void AddresseeEditorWidget::setupTab2()
           label = new QLabel( i18n( "Birthday:" )+" ", nbox );
           mBirthdayPicker = new KDateEdit(  nbox  );
-          mBirthdayPicker->toggleDateFormat();
+          //mBirthdayPicker->toggleDateFormat();
           mBirthdayPicker->setHandleInvalid( true );
           connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
@@ -682,5 +682,5 @@ void AddresseeEditorWidget::setupTab2()
           layout->addWidget( label, iii, 1 );
           mBirthdayPicker = new KDateEdit( tab2 );
-          mBirthdayPicker->toggleDateFormat();
+          //mBirthdayPicker->toggleDateFormat();
           mBirthdayPicker->setHandleInvalid( true );
           connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
@@ -1080,6 +1080,4 @@ void AddresseeEditorWidget::save()
   if ( mBirthdayPicker->inputIsValid() ) {
       QDate da = mBirthdayPicker->date();
-      if ( da > QDate::currentDate() )
-          da.setYMD(da.year()-100, da.month(), da.day() );
       mAddressee.setBirthday( QDateTime( da ) );
       //qDebug("bday %s ",da.toString().latin1());
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3715786..046cb63 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -376,4 +376,5 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle()));
+  connect( ExternalAppHandler::instance(), SIGNAL (doRingSync()),this, SLOT( doRingSync()));
   connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog()));
 
@@ -2581,4 +2582,8 @@ void KABCore::resizeAndCallContactdialog()
 }
 
+void KABCore::doRingSync()
+{
+    syncManager->multiSync( false );
+}
 void KABCore::callContactdialog()
 {
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 6479a58..ceeeda7 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -374,4 +374,5 @@ class KABCore : public QWidget, public KSyncInterface
     void resizeAndCallContactdialog();
     void callContactdialog();
+    void doRingSync();
 
   void importFromOL();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 68233e8..d8373a6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -566,9 +566,8 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
         //qDebug("msg: %s  all: %s ", msg.latin1(), allmsg.latin1() );
         if ( msg == "-newEvent" ) {
-            mView->newEvent();
+            QTimer::singleShot( 0, mView, SLOT ( newEvent()));
         }
         if ( msg == "-newTodo" ) {
-            mView->newTodo();
-
+            QTimer::singleShot( 0, mView, SLOT ( newTodo()));
         }
         if ( msg == "-showWN" ) {
@@ -588,5 +587,5 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
         }
         else if ( msg == "-ringSync"  ) {
-            mSyncManager->multiSync( false );
+            QTimer::singleShot( 0, this, SLOT (startMultiSync()));
         }
         else if ( msg == "-showWeek" ) {
@@ -620,5 +619,19 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
     raise();
 }
-
+void MainWindow::startMultiSync()
+{
+    QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
+    if ( QMessageBox::information( this, i18n("KDE-Pim Sync"),
+                                   question,
+                                   i18n("Yes"), i18n("No"),
+                                   0, 0 ) != 0 ) {
+        setCaption(i18n("Aborted! Nothing synced!"));
+        return;
+    }
+    mSyncManager->multiSync( false );
+#ifndef DESKTOP_VERSION
+    QCopEnvelope e("QPE/Application/kapi", "doRingSync");
+#endif
+}
 QPixmap MainWindow::loadPixmap( QString name )
 {
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index c9817c3..a4d0523 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -53,4 +53,5 @@ class MainWindow : public QMainWindow
     void recieve( const QCString& msg, const QByteArray& data );
  protected slots:  
+    void startMultiSync();
     void setCaptionToDates();
     void weekAction();
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 0e9c5e5..2ce6926 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -31,4 +31,5 @@ $Id$
 
 #include <qfile.h>
+#include <qtimer.h>
 #include <qmap.h>
 #include <qregexp.h>
@@ -1130,13 +1131,18 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete
 void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data )
 {
-
+    qDebug("ExternalAppHandler::appMessage %s %x", cmsg.data(), this);
     if ( cmsg == "nextView()" ) {
         qDebug("nextView()");
-        emit nextView();
+        QTimer::singleShot( 0, this, SIGNAL ( nextView() ));
         return;
     }
     if ( cmsg == "callContactdialog()" ) {
         qDebug("callContactdialog()");
-        emit callContactdialog();
+        QTimer::singleShot( 0, this, SIGNAL ( callContactdialog() ));
+        return;
+    }
+    if ( cmsg == "doRingSync" ) {
+        qDebug("doRingSync");
+        QTimer::singleShot( 0, this, SIGNAL ( doRingSync() ));
         return;
     }
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 097f306..b899ad7 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -236,4 +236,5 @@ class ExternalAppHandler : public QObject
     void callContactdialog();
     void nextView();
+    void doRingSync();
     // Emmitted when the target app receives a request from the source app
     void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid);
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index db815d6..038e032 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -522,4 +522,5 @@ void KSyncManager::multiSync( bool askforPrefs  )
         return;
     setBlockSave(true);
+    if ( askforPrefs ) {
     QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
     if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"),
@@ -531,4 +532,5 @@ void KSyncManager::multiSync( bool askforPrefs  )
         return;
     }
+    }
     mCurrentSyncDevice = i18n("Multiple profiles") ;
     mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;