many AB fixes

6 files changed, 15 insertions, 11 deletions

diff --git a/kaddressbook/filter.cpp b/kaddressbook/filter.cpp
index 9cb4c2d..7a869fa 100644
--- a/kaddressbook/filter.cpp
+++ b/kaddressbook/filter.cpp
@@ -150,5 +150,5 @@ void Filter::restore( KConfig *config )
   mCategoryList = config->readListEntry( "Categories" );
   mMatchRule = (MatchRule)config->readNumEntry( "MatchRule", Matching );
-  mCriteria = config->readNumEntry( "Criteria", (ShowPublic | ShowPrivate| ShowConfidential) );
+  mCriteria = config->readNumEntry( "Criteria", (ShowPublic | ShowPrivate| ShowConfidential ) );
 }
 
diff --git a/kaddressbook/filter.h b/kaddressbook/filter.h
index 26870d7..93f1352 100644
--- a/kaddressbook/filter.h
+++ b/kaddressbook/filter.h
@@ -40,5 +40,5 @@ class Filter
 {
   public: 
-    enum { ShowPublic = 1, ShowPrivate = 2, ShowConfidential = 4};
+    enum { ShowPublic = 1, ShowPrivate = 2, ShowConfidential = 4 };
      void setCriteria(int c) { mCriteria = c ;}
     int criteria() const { return mCriteria;}
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 987f234..1194406 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -97,5 +97,4 @@ void FilterEditDialog::setFilter( const Filter &filter )
   mPrivate->setChecked(c & Filter::ShowPrivate);
   mConfidential->setChecked(c & Filter::ShowConfidential);
-
 }
 
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e61f65f..aa04631 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -264,5 +264,5 @@ class KAex2phonePrefs : public QDialog
         // lay->addWidget( mWriteToSim );
         lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) );  
-        lab->setAlignment (AlignHCenter  ); 
+        lab->setAlignment (AlignHCenter); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
@@ -566,4 +566,6 @@ void KABCore::saveSettings()
 
   KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
+  KABPrefs::instance()->writeConfig();
+  qDebug("KABPrefs::instance()->writeConfig() ");
 }
 
@@ -2686,4 +2688,5 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
         //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( localMod > mLastAddressbookSync );
+        //qDebug("cahnged rem %d loc %d",remCh, locCh  );
         if ( !remCh && ! locCh ) {
             //qDebug("both not changed ");
@@ -2763,6 +2766,7 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
         if ( lastSync > remoteMod )
             return 1;
-        if ( lastSync > localMod )
+        if ( lastSync > localMod ) {
             return 2;
+        }
         localIsNew = localMod >= remoteMod;
         //qDebug("conflict! ************************************** ");
@@ -3007,8 +3011,10 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
-        if ( !filterOUT.name().isEmpty() && ! filterOUT.filterAddressee( inL ) )
-            skipIncidence = true;
-        if ( !skipIncidence )  {
+        if ( ! skipIncidence ) {
             inL = local->findByUid( uid );
+            if ( (!filterOUT.name().isEmpty()) && (! filterOUT.filterAddressee( inL ) ) )
+                skipIncidence = true;
+        }
+        if ( !skipIncidence )  {
             if ( !inL.resource() || inL.resource()->includeInSync() ) {
                 inR = remote->findByUid( uid );
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 2832257..519dc92 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -228,5 +228,5 @@ void KAddressBookMain::closeEvent( QCloseEvent* ce )
     save();
     mCore->saveSettings();
-    KABPrefs::instance()->writeConfig();
+    //KABPrefs::instance()->writeConfig();
   }
 
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 9c3a641..4be860e 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -284,10 +284,9 @@ void ViewManager::setActiveView( const QString &name )
 //US performance optimization. setActiveFilter calls also mActiveView->refresh()
 //US mActiveView->refresh();
-
+    mCore->saveSettings();
   }
   else
   {
   qDebug("ViewManager::setActiveView: unable to find view" );
-    kdDebug(5720) << "ViewManager::setActiveView: unable to find view\n";
   }
 }