[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=fc687e8

The following commit has been merged in the master branch:
commit fc687e89719a1bbe90c9a45a5901962cab896da3
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Feb 23 13:13:39 2012 +0100

    Fix the context menu entries which got broken by my latest commit
---
 presence/src/presence-applet.cpp | 10 ++++++++++
 presence/src/presence-applet.h   |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index ab7624f..53e23b1 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -163,6 +163,16 @@ void TelepathyPresenceApplet::onAccountManagerReady(Tp::PendingOperation* op)
 
 void TelepathyPresenceApplet::onActivated()
 {
+    startContactList();
+}
+
+void TelepathyPresenceApplet::startAccountManager()
+{
+    KToolInvocation::startServiceByDesktopName("kcm_ktp_accounts");
+}
+
+void TelepathyPresenceApplet::startContactList()
+{
     KToolInvocation::startServiceByDesktopName("ktp-contactlist");
 }
 
diff --git a/presence/src/presence-applet.h b/presence/src/presence-applet.h
index b58fe9f..9c0533f 100644
--- a/presence/src/presence-applet.h
+++ b/presence/src/presence-applet.h
@@ -63,6 +63,9 @@ private Q_SLOTS:
     void toolTipAboutToShow();
     void toolTipHidden();
 
+    void startAccountManager();
+    void startContactList();
+
 private:
     /** used only upon creation to setup a list of actions for the context menu */
     void setupContextMenuActions();

-- 
ktp-contact-applet packaging