-rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index f30a205..d1def18 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp | |||
@@ -143,5 +143,5 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString | |||
143 | 143 | ||
144 | delete access; | 144 | delete access; |
145 | delete backend; | 145 | //US the deletion of the access object deletes the backend object as well. |
146 | 146 | ||
147 | return true; | 147 | return true; |
@@ -196,5 +196,5 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | |||
196 | 196 | ||
197 | delete access; | 197 | delete access; |
198 | delete backend; | 198 | //US the deletion of the access object deletes the backend object as well. |
199 | 199 | ||
200 | return adrlst; | 200 | return adrlst; |
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index c017f5b..54d0cbd 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp | |||
@@ -180,4 +180,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
180 | { | 180 | { |
181 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); | 181 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); |
182 | if ( fileName.isEmpty() ) | ||
183 | return addrList; | ||
184 | |||
182 | } | 185 | } |
183 | else | 186 | else |
@@ -185,8 +188,9 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
185 | //US url = XXPortManager::importURL; | 188 | //US url = XXPortManager::importURL; |
186 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); | 189 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); |
190 | if ( url.isEmpty() ) | ||
191 | return addrList; | ||
192 | |||
187 | } | 193 | } |
188 | 194 | ||
189 | if ( url.isEmpty() ) | ||
190 | return addrList; | ||
191 | 195 | ||
192 | QFile file( fileName ); | 196 | QFile file( fileName ); |