3 files changed, 27 insertions, 2 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2f00a09..ea87929 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1314,2 +1314,3 @@ void KABCore::setDetailsVisible( bool visible )
       mDetails->show();
+      mIncSearchWidget->setFocus();
     }
@@ -1318,2 +1319,3 @@ void KABCore::setDetailsVisible( bool visible )
       mDetails->hide();
+      mViewManager->setFocusAV();
     }
@@ -2046,2 +2048,5 @@ void KABCore::addActionsManually()
       }
+  } else {
+      if (KABPrefs::instance()->mMultipleViewsAtOnce )
+          mActionSave->plug( tb );
   }
@@ -2509,3 +2514,12 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     mLastAddressbookSync = QDateTime::currentDateTime();
-    QDateTime modifiedCalendar = mLastAddressbookSync;;
+    if ( syncManager->syncWithDesktop() ) {
+        remote->removeSyncInfo( QString());//remove all info
+        if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
+            mLastAddressbookSync = KSyncManager::mRequestedSyncEvent;
+            qDebug("using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() );
+        } else {
+            qDebug("ERROR: KSyncManager::mRequestedSyncEvent has invalid datatime ");
+        }
+    }
+    QDateTime modifiedCalendar = mLastAddressbookSync;
     addresseeLSync = getLastSyncAddressee();
@@ -2607,2 +2621,4 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                                 inR.setExternalUID( idS );
+                                if ( syncManager->syncWithDesktop() )
+                                     inR.setIDStr( "changed" );
                             } else {
@@ -2899,3 +2915,6 @@ void KABCore::getFile( bool success )
 void KABCore::syncFileRequest()
-{
+{ 
+    if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) {
+        syncManager->slotSyncMenu( 999 );
+    } 
     mAddressBook->export2File( sentSyncFile() );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index f4fb08b..81e0d99 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -302,2 +302,7 @@ void ViewManager::refreshView( const QString &uid )
 
+void ViewManager::setFocusAV()
+{
+ if ( mActiveView )
+     mActiveView->setFocus();
+}
 void ViewManager::editView()
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 585f4e9..a03a83f 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -66,2 +66,3 @@ class ViewManager : public QWidget
     void setListSelected(QStringList);
+    void setFocusAV();