| -rw-r--r-- | kabc/addressbook.cpp | 1 | ||||
| -rw-r--r-- | kaddressbook/views/kaddressbookcardview.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/views/kaddressbookiconview.cpp | 7 | ||||
| -rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 3 |
5 files changed, 12 insertions, 3 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index ed5e9c2..dc3cda1 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -400,4 +400,5 @@ void AddressBook::export2File( QString fileName ) t << vcard << "\r\n"; } + t << "\r\n\r\n"; outFile.close(); } diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 8d0fca1..4babf67 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -332,4 +332,6 @@ void KAddressBookCardView::refresh(QString uid) for (iter = addresseeList.begin(); iter != addresseeList.end(); ++iter) { + if ( (*iter).uid().left(2) == "la" && (*iter).uid().left(19) == QString("last-syncAddressee-") ) + continue; aItem = new AddresseeCardViewItem(fields(), mShowEmptyFields, addressBook(), *iter, mCardView); diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 0ffc674..fdc0db9 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -317,6 +317,9 @@ void KAddressBookIconView::refresh(QString uid) KABC::Addressee::List addresseeList = addressees(); KABC::Addressee::List::Iterator iter; - for ( iter = addresseeList.begin(); iter != addresseeList.end(); ++iter ) - aItem = new AddresseeIconViewItem( fields(), addressBook(), *iter, mIconView ); + for ( iter = addresseeList.begin(); iter != addresseeList.end(); ++iter ) { + if ( (*iter).uid().left(2) == "la" && (*iter).uid().left(19) == QString("last-syncAddressee-") ) + continue; + aItem = new AddresseeIconViewItem( fields(), addressBook(), *iter, mIconView ); + } mIconView->arrangeItemsInGrid( true ); diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 1dc9198..fbfddba 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -278,4 +278,6 @@ void KAddressBookTableView::refresh(QString uid) KABC::Addressee::List::Iterator it; for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { + if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) + continue; ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); if ( (*it).uid() == currentUID ) diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index f7766f8..c7ce8cb 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -257,5 +257,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); - mSyncManager->setDefaultFileName( defaultFileName()); + mSyncManager->setDefaultFileName( defaultFileName()); + connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); mSyncManager->fillSyncMenu(); |