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

The following commit has been merged in the master branch:
commit 1ec052e1d9b121659e16745aadcee19c55ba5da1
Author: Siddhartha Sahu <sh.siddhartha at gmail.com>
Date:   Sun Mar 30 13:17:38 2014 +0530

    Use SettingsKcmDialog from K-C-I
    
    REVIEW: 117181
    BUG: 326998
---
 presence/src/presence-applet.cpp | 14 +++++++++-----
 presence/src/presence-applet.h   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index 1887070..c9c2a1a 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -37,6 +37,7 @@
 #include <KTp/Models/presence-model.h>
 #include <KTp/Widgets/add-contact-dialog.h>
 #include <KTp/Widgets/join-chat-room-dialog.h>
+#include <KTp/Widgets/settings-kcm-dialog.h>
 
 #include <Plasma/ToolTipManager>
 #include <Plasma/Svg>
@@ -215,7 +216,7 @@ void TelepathyPresenceApplet::setupContextMenuActions()
     KAction *joinChatroomAction = new KAction(KIcon("user-group-new"), i18n("Join Chat Room..."), this);
 
     // application actions
-    KAction *showAccountManagerAction = new KAction(KIcon("telepathy-kde"), i18n("Account Manager..."), this);
+    KAction *showSettingsKCMAction = new KAction(KIcon("telepathy-kde"), i18n("Instant Messaging Settings..."), this);
     KAction *showContactListAction = new KAction(KIcon("meeting-attending"), i18n("Contact List..."), this);
     KAction *addContactAction = new KAction(KIcon("list-add-user"), i18n("Add New Contacts..."), this);
     KAction *makeCallAction = 0;
@@ -228,7 +229,7 @@ void TelepathyPresenceApplet::setupContextMenuActions()
     }
 
     // connect actions
-    connect(showAccountManagerAction, SIGNAL(triggered()), this, SLOT(startAccountManager()));
+    connect(showSettingsKCMAction, SIGNAL(triggered()), this, SLOT(showSettingsKCM()));
     connect(showContactListAction, SIGNAL(triggered()), this, SLOT(toggleContactList()));
     connect(addContactAction, SIGNAL(triggered()), this, SLOT(onAddContactRequest()));
     connect(joinChatroomAction, SIGNAL(triggered()), this, SLOT(onJoinChatRoomRequest()));
@@ -240,7 +241,7 @@ void TelepathyPresenceApplet::setupContextMenuActions()
     }
 
     m_contextActions.append(moreMenu->addSeparator());
-    m_contextActions.append(showAccountManagerAction);
+    m_contextActions.append(showSettingsKCMAction);
     m_contextActions.append(showContactListAction);
 
     m_contextActions.append(moreMenu->addSeparator());
@@ -278,9 +279,12 @@ void TelepathyPresenceApplet::onAccountsChanged()
     }
 }
 
-void TelepathyPresenceApplet::startAccountManager()
+void TelepathyPresenceApplet::showSettingsKCM()
 {
-    KToolInvocation::startServiceByDesktopName("kcm_ktp_accounts");
+    KTp::SettingsKcmDialog *dialog = new KTp::SettingsKcmDialog();
+    dialog->addGeneralSettingsModule();
+    dialog->addNotificationsModule();
+    dialog->show();
 }
 
 void TelepathyPresenceApplet::toggleContactList()
diff --git a/presence/src/presence-applet.h b/presence/src/presence-applet.h
index e090f79..c10894c 100644
--- a/presence/src/presence-applet.h
+++ b/presence/src/presence-applet.h
@@ -69,7 +69,7 @@ private Q_SLOTS:
     void toolTipAboutToShow();
     void toolTipHidden();
 
-    void startAccountManager();
+    void showSettingsKCM();
     void toggleContactList();
     void onAddContactRequest();
     void onMakeCallRequest();

-- 
ktp-contact-applet packaging