[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=8f4e1c2

The following commit has been merged in the master branch:
commit 8f4e1c288da81c7ccf46e29ba5980fb9d8305ae0
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Jul 15 15:23:11 2012 +0300

    MainWidget: Add menu action to start ktp-dialout-ui
---
 main-widget.cpp | 12 ++++++++++++
 main-widget.h   |  1 +
 2 files changed, 13 insertions(+)

diff --git a/main-widget.cpp b/main-widget.cpp
index 5c1021d..ac4fd41 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -49,8 +49,10 @@
 #include <KProtocolInfo>
 #include <KSettings/Dialog>
 #include <KSharedConfig>
+#include <KStandardDirs>
 #include <KStandardShortcut>
 #include <KNotification>
+#include <KToolInvocation>
 
 #include "ui_main-widget.h"
 #include "account-buttons-panel.h"
@@ -220,6 +222,11 @@ MainWidget::MainWidget(QWidget *parent)
     restoreGeometry(guiConfigGroup.readEntry("window_geometry", QByteArray()));
 
     settingsButtonMenu->addAction(i18n("Join Chat Room..."), this, SLOT(onJoinChatRoomRequested()));
+
+    if (!KStandardDirs::findExe("ktp-dialout-ui").isEmpty()) {
+        settingsButtonMenu->addAction(i18n("Make a Call..."), this, SLOT(onMakeCallRequested()));
+    }
+
     settingsButtonMenu->addSeparator();
     settingsButtonMenu->addMenu(helpMenu());
 
@@ -394,6 +401,11 @@ void MainWidget::onJoinChatRoomRequested()
     delete dialog.data();
 }
 
+void MainWidget::onMakeCallRequested()
+{
+    KToolInvocation::kdeinitExec(QLatin1String("ktp-dialout-ui"));
+}
+
 void MainWidget::closeEvent(QCloseEvent* e)
 {
     KSharedConfigPtr config = KGlobal::config();
diff --git a/main-widget.h b/main-widget.h
index dd8f857..a3bab92 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -83,6 +83,7 @@ private Q_SLOTS:
     void onUseGlobalPresenceTriggered();
     void onUsePerAccountPresenceTriggered();
     void onJoinChatRoomRequested();                 /** join chat room action is triggered */
+    void onMakeCallRequested();
     void onCustomContextMenuRequested(const QPoint &point);
     void onGenericOperationFinished(Tp::PendingOperation *operation);   /** called when a Tp::PendingOperation finishes. Used to check for errors */
 

-- 
ktp-contact-list packaging