[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=0555cc6

The following commit has been merged in the master branch:
commit 0555cc6eefc76d603519be3753aefb9e20d639b2
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Mar 5 01:44:49 2015 +0100

    Revert a string-freeze-violating commit
    
    This was supposed to go to master only
---
 kpeople/actionsplugin/kpeople-actions-plugin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kpeople/actionsplugin/kpeople-actions-plugin.cpp b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
index d065840..8c60bc7 100644
--- a/kpeople/actionsplugin/kpeople-actions-plugin.cpp
+++ b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
@@ -214,13 +214,13 @@ QList<QAction*> KPeopleActionsPlugin::actionsForPerson(const KPeople::PersonData
         }
     }
 
-    QAction *action = new IMAction(i18n("Previous Conversations..."),
-                                   QIcon::fromTheme(QStringLiteral("documentation")),
-                                   person.personUri(),
-                                   LogViewer,
-                                   parent);
-    connect(action, SIGNAL(triggered(bool)), SLOT(onActionTriggered()));
-    actions << action;
+//     QAction *action = new IMAction(i18n("Open Log Viewer..."),
+//                                    QIcon::fromTheme(QStringLiteral("documentation")),
+//                                    person.personUri(),
+//                                    LogViewer,
+//                                    parent);
+//     connect(action, SIGNAL(triggered(bool)), SLOT(onActionTriggered()));
+//     actions << action;
 
     return actions;
 }

-- 
ktp-common-internals packaging