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

The following commit has been merged in the master branch:
commit b3958e127b84c1feb3a51c81825811b7bfa51176
Author: Roman Nazarenko <me at jtalk.me>
Date:   Sat Mar 2 20:30:11 2013 +0600

    Quit shortcut (Ctrl+Q) is fixed.
    
    REVIEW: 109241
    BUG: 284793
---
 main-widget.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/main-widget.cpp b/main-widget.cpp
index 723d3b4..778c71e 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -379,6 +379,11 @@ void MainWidget::toggleSearchWidget(bool show)
 
 void MainWidget::setupGlobalMenu()
 {
+    // Since our menu is hidden, its shortcuts do not work.
+    // Here's a workarond: we must assign global menu's unique
+    // items to main window. Since it's always active when an
+    // application is active, shortcuts now will work properly.
+
     m_globalMenu = new KMenuBar(this);
     m_globalMenu->setVisible(false);
 
@@ -391,6 +396,7 @@ void MainWidget::setupGlobalMenu()
     contacts->addAction(m_settingsDialog);
     contacts->addSeparator();
     contacts->addAction(m_quitAction);
+    this->addAction(m_quitAction); // Shortcuts workaround.
     m_globalMenu->addMenu(contacts);
 
     KMenu *view = new KMenu(i18n("View"), m_globalMenu);

-- 
ktp-contact-list packaging