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

The following commit has been merged in the master branch:
commit 1a732062f32045f8f14bd403556467e4641827c4
Author: Sven Brauch <svenbrauch at googlemail.com>
Date:   Sun Sep 22 16:44:34 2013 +0200

    Aproppriate menu entry text for the "Do not group" action in kpeople mode
---
 main-widget.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index df12842..525df47 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -593,7 +593,14 @@ void MainWidget::setupActions(const KConfigGroup& guiConfigGroup)
     m_groupContactsActionGroup->setExclusive(true);
     m_groupContactsActionGroup->addAction(createAction(i18n("Show Contacts by Groups"), m_contactsListView, SLOT(showGrouped()),
                                           guiConfigGroup.readEntry("use_groups", true)));
-    m_groupContactsActionGroup->addAction(createAction(i18n("Show Contacts by Accounts"), m_contactsListView, SLOT(showUngrouped()),
+    QString useGroupsDisabledText;
+    if (KTp::kpeopleEnabled()) {
+        useGroupsDisabledText = i18n("Do not group");
+    }
+    else {
+        useGroupsDisabledText = i18n("Show Contacts by Accounts");
+    }
+    m_groupContactsActionGroup->addAction(createAction(useGroupsDisabledText, m_contactsListView, SLOT(showUngrouped()),
                                           ! guiConfigGroup.readEntry("use_groups", true)));
 
     m_showOfflineAction = new KDualAction(i18n("Show Offline Contacts"),

-- 
ktp-contact-list packaging