[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=e98ba3f

The following commit has been merged in the master branch:
commit e98ba3f675926ca5c823d7e4e9882c8428add116
Author: Mikhail Krishtop <mikhailkrishtop at gmail.com>
Date:   Wed Mar 28 22:17:55 2012 +0100

    Update contact list to use AddContactDialog from KTp
---
 CMakeLists.txt  | 1 +
 main-widget.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1bb81f..31bf58b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,7 @@ target_link_libraries (ktp-contactlist
                        ${TELEPATHY_QT4_LIBRARIES}
                        ${KTP_LIBRARIES}
                        ${KTP_MODELS_LIBRARIES}
+                       ${KTP_WIDGETS_LIBRARIES}
                        ${KDE4_KDEUI_LIBS}
                        ${KDE4_KIO_LIBS}
                        ${KDE4_KCMUTILS_LIBS}
diff --git a/main-widget.cpp b/main-widget.cpp
index a8daa94..b78cd3e 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -39,6 +39,7 @@
 #include <KTp/Models/accounts-model.h>
 #include <KTp/Models/contact-model-item.h>
 #include <KTp/Models/groups-model-item.h>
+#include <KTp/Widgets/add-contact-dialog.h>
 
 #include <KDebug>
 #include <KDialog>
@@ -54,7 +55,6 @@
 #include "ui_main-widget.h"
 #include "account-buttons-panel.h"
 #include "contact-list-application.h"
-#include "dialogs/add-contact-dialog.h"
 #include "dialogs/join-chat-room-dialog.h"
 #include "tooltips/tooltipmanager.h"
 #include "context-menu.h"
@@ -299,7 +299,7 @@ void MainWidget::showMessageToUser(const QString& text, const MainWidget::System
 }
 
 void MainWidget::onAddContactRequest() {
-    QWeakPointer<AddContactDialog> dialog = new AddContactDialog(m_contactsListView->accountsModel(), this);
+    QWeakPointer<KTp::AddContactDialog> dialog = new KTp::AddContactDialog(m_contactsListView->accountsModel(), this);
     if (dialog.data()->exec() == QDialog::Accepted) {
         Tp::AccountPtr account = dialog.data()->account();
         if (account.isNull()) {

-- 
ktp-contact-list packaging