From kde-commits  Mon Sep 30 21:10:43 2013
From: Sven Brauch <svenbrauch () googlemail ! com>
Date: Mon, 30 Sep 2013 21:10:43 +0000
To: kde-commits
Subject: [ktp-contact-list/kde-telepathy-0.7] /: Aproppriate menu entry text for the "Do not group" action in
Message-Id: <E1VQkjr-0007Qt-3Y () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=138057545115095

Git commit 1a732062f32045f8f14bd403556467e4641827c4 by Sven Brauch.
Committed on 22/09/2013 at 14:44.
Pushed by brauch into branch 'kde-telepathy-0.7'.

Aproppriate menu entry text for the "Do not group" action in kpeople mode

M  +8    -1    main-widget.cpp

http://commits.kde.org/telepathy-contact-list/1a732062f32045f8f14bd40355646=
7e4641827c4

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& guiC=
onfigGroup)
     m_groupContactsActionGroup->setExclusive(true);
     m_groupContactsActionGroup->addAction(createAction(i18n("Show Contacts=
 by Groups"), m_contactsListView, SLOT(showGrouped()),
                                           guiConfigGroup.readEntry("use_gr=
oups", true)));
-    m_groupContactsActionGroup->addAction(createAction(i18n("Show Contacts=
 by Accounts"), m_contactsListView, SLOT(showUngrouped()),
+    QString useGroupsDisabledText;
+    if (KTp::kpeopleEnabled()) {
+        useGroupsDisabledText =3D i18n("Do not group");
+    }
+    else {
+        useGroupsDisabledText =3D i18n("Show Contacts by Accounts");
+    }
+    m_groupContactsActionGroup->addAction(createAction(useGroupsDisabledTe=
xt, m_contactsListView, SLOT(showUngrouped()),
                                           ! guiConfigGroup.readEntry("use_=
groups", true)));
 =

     m_showOfflineAction =3D new KDualAction(i18n("Show Offline Contacts"),