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

The following commit has been merged in the master branch:
commit c992bf8752bebf1aa95aabf095803aede2e2b8c5
Author: Roman Nazarenko <me at jtalk.me>
Date:   Thu Feb 28 15:13:06 2013 +0000

    Replace custom action with KStandardAction
---
 main-widget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index da5ff61..33de920 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -555,7 +555,8 @@ KAction *MainWidget::createAction(const QString& text, QObject *signalReceiver,
 
 void MainWidget::setupActions(const KConfigGroup& guiConfigGroup)
 {
-    m_settingsDialog = createAction(i18n("Settings"), m_contactsListView, SLOT(showSettingsKCM()), KIcon("configure"));
+    m_settingsDialog = KStandardAction::preferences(m_contactsListView, SLOT(showSettingsKCM()),this);
+    m_settingsDialog->setText(i18n("Settings")); // We set text manually since standard name is too long
     m_joinChatRoom = createAction(i18n("Join Chat Room..."), this, SLOT(onJoinChatRoomRequested()));
     m_makeCall = createAction(i18n("Make a Call..."), this, SLOT(onMakeCallRequested()));
 

-- 
ktp-contact-list packaging