3 files changed, 19 insertions, 8 deletions

diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index d6df981..cf6b11a 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -164,5 +164,5 @@ bool ResourceQtopia::load()
   if ( !doc.setContent( &file ) ) {
     file.close();
-    return false;
+    return true;
   }
   bool res;
diff --git a/kaddressbook/xxport/qtopia_xxport.cpp b/kaddressbook/xxport/qtopia_xxport.cpp
index 0cf6546..fc4abbb 100644
--- a/kaddressbook/xxport/qtopia_xxport.cpp
+++ b/kaddressbook/xxport/qtopia_xxport.cpp
@@ -34,4 +34,5 @@ $Id$
 #include "xxportmanager.h"
 #include "qtopia_xxport.h"
+#include <kfiledialog.h>
 
 /*US
@@ -63,6 +64,6 @@ QtopiaXXPort::QtopiaXXPort( KABC::AddressBook *ab, QWidget *parent, const char *
   if ( mFactory && !mFactory->typeName( "qtopia" ).isEmpty() )
   {
-    createImportAction( i18n( "Import Qtopia..." ) );
-    createExportAction( i18n( "Export Qtopia..." ) );
+    createImportAction( i18n( "Import xml (Qtopia)..." ) );
+    createExportAction( i18n( "Export xml (Qtopia)..." ) );
   }
 }
@@ -70,9 +71,16 @@ QtopiaXXPort::QtopiaXXPort( KABC::AddressBook *ab, QWidget *parent, const char *
 bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QString &identifier )
 {
-  return _exportContacts( list, identifier, defaultFileName );
+    QString fn =KFileDialog::getSaveFileName( defaultFileName, i18n("Import xml file"), 0 );
+    if ( fn == "" )
+        return false;
+
+  return _exportContacts( list, identifier, fn );
 }
 
 KABC::AddresseeList QtopiaXXPort::importContacts( const QString &identifier ) const
 {
-  return _importContacts( identifier, defaultFileName );
+    QString fn =KFileDialog::getOpenFileName( defaultFileName, i18n("Import xml file"), 0 );
+    if ( fn == "" )
+        return KABC::AddresseeList() ;
+  return _importContacts( identifier, fn );
 }
diff --git a/kaddressbook/xxportobject.cpp b/kaddressbook/xxportobject.cpp
index 67e8406..bd9d986 100644
--- a/kaddressbook/xxportobject.cpp
+++ b/kaddressbook/xxportobject.cpp
@@ -30,4 +30,5 @@ $Id$
 
 #include <qmap.h>
+#include <qfile.h>
 #include <qsignalmapper.h>
 
@@ -182,6 +183,8 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con
     return false;
 
-  if (fileName != QString::null)
+    if (fileName != QString::null) {
           mResource->setFileName( fileName );
+    } else 
+        return false;
 
 
@@ -194,5 +197,5 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con
         return false;
   }
-
+    if ( QFile::exists ( fileName ) ) {
   res = tmpAB.load();
   if (res == false)
@@ -213,5 +216,5 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con
     }
   }
-
+    }
 
   KABC::Addressee::List::ConstIterator it;