Commit afa9cf00 authored by Tobias Koenig's avatar Tobias Koenig
Browse files

Drop libakonadi-kabccommon and port the existing apps to libakonadi-contact

svn path=/trunk/KDE/kdepim/; revision=1018790
parent bd252453
......@@ -89,7 +89,7 @@ kde4_add_executable(kaddressbook RUN_UNINSTALLED ${kaddressbook_SRCS})
target_link_libraries(kaddressbook ${KDEPIMLIBS_SYNDICATION_LIBS} kdepim ${KDEPIMLIBS_KCAL_LIBS}
${KDE4_KIO_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS})
target_link_libraries(kaddressbook ${KDEPIMLIBS_AKONADI_LIBS} akonadi-kabccommon ${KDE4_KDEUI_LIBS} kaddressbookprivate)
target_link_libraries(kaddressbook ${KDEPIMLIBS_AKONADI_LIBS} ${KDE4_KDEUI_LIBS} kaddressbookprivate)
if(QGPGME_FOUND)
target_link_libraries(kaddressbook ${QGPGME_LIBRARIES})
......
......@@ -38,16 +38,14 @@
#include <akonadi/contact/contactviewer.h>
#include <akonadi/control.h>
#include <akonadi/entityfilterproxymodel.h>
#include <akonadi/entitytreeviewstatesaver.h>
#include <akonadi/itemview.h>
#include <akonadi/mimetypechecker.h>
#include <akonadi/entitytreeviewstatesaver.h>
#include <kaction.h>
#include <kactioncollection.h>
#include <kabc/addressee.h>
#include <kabc/contactgroup.h>
#include <kabc/contactlineedit.h>
#include <kabc/kabcmodel.h>
#include <kdescendantsproxymodel.h>
#include <kicon.h>
#include <klineedit.h>
......@@ -197,10 +195,12 @@ MainWidget::MainWidget( KXMLGUIClient *guiClient, QWidget *parent )
MainWidget::~MainWidget()
{
mModelColumnManager->store();
KConfigGroup cfg( Settings::self()->config(), "CollectionViewState" );
Akonadi::EntityTreeViewStateSaver saver( mCollectionView );
saver.saveState( cfg );
cfg.sync();
Settings::self()->writeConfig();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment