[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=87b242b

The following commit has been merged in the master branch:
commit 87b242b22216acfa211e01c6a1c7ddb91f57373c
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Mar 9 16:19:04 2015 +0100

    Re-enable the log viewer action in master
    
    It got disabled after merging the Applications/15.04 branch
---
 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 8c60bc7..d065840 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("Open Log Viewer..."),
-//                                    QIcon::fromTheme(QStringLiteral("documentation")),
-//                                    person.personUri(),
-//                                    LogViewer,
-//                                    parent);
-//     connect(action, SIGNAL(triggered(bool)), SLOT(onActionTriggered()));
-//     actions << action;
+    QAction *action = new IMAction(i18n("Previous Conversations..."),
+                                   QIcon::fromTheme(QStringLiteral("documentation")),
+                                   person.personUri(),
+                                   LogViewer,
+                                   parent);
+    connect(action, SIGNAL(triggered(bool)), SLOT(onActionTriggered()));
+    actions << action;
 
     return actions;
 }

-- 
ktp-common-internals packaging