many sync fixes

3 files changed, 8 insertions, 4 deletions

diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index bd32859..5334a0e 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -656,13 +656,13 @@ void AddresseeEditorWidget::setupTab2()
       layout->addWidget( mChildEdit, iii, 2 );
       ++iii;
       if ( QApplication::desktop()->width() == 640 ) {
           QHBox * nbox = new QHBox ( tab2 );
           label = new QLabel( i18n( "Birthday:" )+" ", nbox );
           mBirthdayPicker = new KDateEdit(  nbox  );
-          mBirthdayPicker->toggleDateFormat();
+          //mBirthdayPicker->toggleDateFormat();
           mBirthdayPicker->setHandleInvalid( true );
           connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                    SLOT( dateChanged( QDate ) ) );
            
           label->setBuddy( mBirthdayPicker );
   
@@ -678,13 +678,13 @@ void AddresseeEditorWidget::setupTab2()
 
       } else {
 
           label = new QLabel( i18n( "Birthday:" ), tab2 );
           layout->addWidget( label, iii, 1 );
           mBirthdayPicker = new KDateEdit( tab2 );
-          mBirthdayPicker->toggleDateFormat();
+          //mBirthdayPicker->toggleDateFormat();
           mBirthdayPicker->setHandleInvalid( true );
           connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                    SLOT( dateChanged( QDate ) ) );
            
           label->setBuddy( mBirthdayPicker );
           layout->addWidget( mBirthdayPicker, iii, 2 );
@@ -1076,14 +1076,12 @@ void AddresseeEditorWidget::save()
   mAddressee.setRole( mRoleEdit->text() );
   mAddressee.setOrganization( mOrgEdit->text() );
   mAddressee.setUrl( KURL( mURLEdit->text() ) );
   mAddressee.setNote( mNoteEdit->text() );
   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());
   }
   else {
     mAddressee.setBirthday( QDateTime() );
     mBirthdayPicker->clear();
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3715786..046cb63 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -372,12 +372,13 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 
 
   connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
   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()));
 
 
 #ifndef KAB_EMBEDDED
   connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
            mXXPortManager, SLOT( importVCard( const KURL& ) ) );
@@ -2577,12 +2578,16 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
 void KABCore::resizeAndCallContactdialog()
 {
     updateMainWindow();
     QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) );
 }
 
+void KABCore::doRingSync()
+{
+    syncManager->multiSync( false );
+}
 void KABCore::callContactdialog()
 {
     static bool running = false;
     if (running) return;
     running = true;
   QStringList nameList;
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 6479a58..ceeeda7 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -370,12 +370,13 @@ class KABCore : public QWidget, public KSyncInterface
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setJumpButtonBar( bool visible );
     void setCaptionBack();
     void resizeAndCallContactdialog();
     void callContactdialog();
+    void doRingSync();
 
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
     void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();