[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=1ef5380

The following commit has been merged in the master branch:
commit 1ef5380c43805fe253f08640fbc02fe6a9ed3f14
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 19 00:14:18 2014 +0100

    Temporarily disable unused merge button in menu
    
    BUG: 331278
---
 main-widget.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 93574d9..e4a9cda 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -427,8 +427,9 @@ void MainWidget::setupGlobalMenu()
     if (!KStandardDirs::findExe("ktp-dialout-ui").isEmpty()) {
         contacts->addAction(m_makeCall);
     }
+    //temporarily disable until funcationality is restored in libkpeople
     if (KTp::kpeopleEnabled()) {
-        contacts->addAction(m_mergeContacts);
+//         contacts->addAction(m_mergeContacts);
     }
     contacts->addAction(m_settingsDialog);
     contacts->addSeparator();
@@ -502,7 +503,7 @@ void MainWidget::setupToolBar()
     }
 
     if (KTp::kpeopleEnabled()) {
-        settingsButtonMenu->addAction(m_mergeContacts);
+//         settingsButtonMenu->addAction(m_mergeContacts);
     }
 
     settingsButtonMenu->addSeparator();

-- 
ktp-contact-list packaging