[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=a16fff7

The following commit has been merged in the master branch:
commit a16fff7f94848292fb7f8c10d3f4e08f784ce752
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Sat Sep 29 03:39:12 2012 +0530

    Drop unecessary header includes and CMake target link libraries
    Refactor onNotificationConfigure -> onNotificationConfigureTriggered
---
 CMakeLists.txt   | 1 -
 context-menu.cpp | 7 ++-----
 context-menu.h   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca90ccf..7cb36cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,6 @@ target_link_libraries (ktp-contactlist
                        ${KDE4_KDEUI_LIBS}
                        ${KDE4_KIO_LIBS}
                        ${KDE4_KCMUTILS_LIBS}
-		       ${KDE4_KNOTIFYCONFIG_LIBRARY}
 )
 
 # Install:
diff --git a/context-menu.cpp b/context-menu.cpp
index 3a44f9e..e3b6e18 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -27,9 +27,6 @@
 #include <KToolInvocation>
 #include <KInputDialog>
 #include <KMessageBox>
-#include <KStandardAction>
-#include <KActionCollection>
-#include <KNotifyConfigWidget>
 
 #include <KTp/Models/accounts-model.h>
 #include <KTp/Models/contact-model-item.h>
@@ -154,7 +151,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
     action = menu->addAction(KIcon("dialog-information"), i18n("Configure Notifications ..."));
     action->setEnabled(true);
     connect(action, SIGNAL(triggered()),
-                           SLOT(onNotificationConfigured()));
+                           SLOT(onNotificationConfigureTriggered()));
 
     // add "goto" submenu for navigating to links the contact has in presence message
     // first check to see if there are any links in the contact's presence message
@@ -578,7 +575,7 @@ void ContextMenu::onResendAuthorization()
             m_mainWidget, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
 }
 
-void ContextMenu::onNotificationConfigured()
+void ContextMenu::onNotificationConfigureTriggered()
 {
     ContactModelItem* contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
 
diff --git a/context-menu.h b/context-menu.h
index 481c7f4..77a1111 100644
--- a/context-menu.h
+++ b/context-menu.h
@@ -62,7 +62,7 @@ private Q_SLOTS:
     void onOpenLinkTriggered(QAction *action);      /** triggered from custom contact menu when user clicks contact link */
     void onRerequestAuthorization();
     void onResendAuthorization();
-    void onNotificationConfigured();
+    void onNotificationConfigureTriggered();
 
 private:
     ContactListWidget     *m_mainWidget;

-- 
ktp-contact-list packaging