more sync

5 files changed, 18 insertions, 7 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index f3744bc..e04f4b1 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -379,3 +379,3 @@ bool AddressBook::save( Ticket *ticket )
 // exports all Addressees, which are syncable
-void  AddressBook::export2File( QString fileName )
+void  AddressBook::export2File( QString fileName, QString resourceName )
 {
@@ -394,3 +394,8 @@ void  AddressBook::export2File( QString fileName )
   for ( it = begin(); it != end(); ++it ) { 
-      if ( (*it).resource() && (*it).resource()->includeInSync() ) {
+      if ( (*it).resource()  ) {
+          bool include = (*it).resource()->includeInSync();
+          if ( !resourceName.isEmpty()  )
+              include = (resourceName == (*it).resource()->name() );
+          if ( include ) {
+              qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->name() ).arg( fileName ) );
           if ( !(*it).IDStr().isEmpty() ) {
@@ -405,2 +410,3 @@ void  AddressBook::export2File( QString fileName )
   }
+  }
   t <<  "\r\n\r\n";
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 18c03b5..4a0d0a3 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -148,3 +148,3 @@ class AddressBook : public QObject
     void preparePhoneSync( QString currentSyncDevice, bool isPreSync );
-    void export2File( QString fileName );
+    void export2File( QString fileName, QString resourceName = "" );
     bool export2PhoneFormat(  QStringList uids ,QString fileName );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2dea619..5d377bf 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1938,3 +1938,3 @@ void KABCore::initGUI()
 
-    connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
+    connect(syncManager , SIGNAL( request_file(const QString &) ), this, SLOT( syncFileRequest(const QString &) ) );
     connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
@@ -3474,3 +3474,3 @@ void KABCore::getFile( bool success )
 }
-void KABCore::syncFileRequest()
+void KABCore::syncFileRequest(const QString & resource)
 { 
@@ -3479,4 +3479,9 @@ void KABCore::syncFileRequest()
     } 
+
+    if ( resource == "ALL" ) {
     mAddressBook->export2File( sentSyncFile() );
 }
+    else
+        mAddressBook->export2File( sentSyncFile(), resource);
+}
 QString KABCore::sentSyncFile()
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index c4a0b3b..2d1505f 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -359,3 +359,3 @@ class KABCore : public QWidget, public KSyncInterface
     void getFile( bool success );
-    void syncFileRequest();
+    void syncFileRequest(const QString &);
     void setDetailsVisible( bool visible );
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index f80c2a6..e615cbe 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1466,3 +1466,3 @@ void KServerSocket::send_file()
     emit request_file(mResource);
-    emit request_file();
+    //emit request_file();
     qApp->processEvents();