[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=6ab2fb3

The following commit has been merged in the master branch:
commit 6ab2fb3e910282ee3f2c26ea9d2a18914a22a931
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Jul 18 15:46:34 2011 +0200

    Resolve merge conflict
---
 main-widget.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 3a15817..547433d 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -872,7 +872,12 @@ KMenu* MainWidget::contactContextMenu(const QModelIndex &index)
     SLOT(slotBlockContactTriggered()));
 }*/
 
-    menu->exec(QCursor::pos());
+    menu->addSeparator();
+
+    action = menu->addAction(i18n("Show Info..."));
+    action->setIcon(KIcon(""));
+    connect(action, SIGNAL(triggered()), SLOT(slotShowInfo()));
+
     return menu;
 }
 

-- 
ktp-contact-list packaging