← Back to branch summary

~ubuntu-branches/ubuntu/saucy/bluedevil/saucy-updates

« back to all changes in this revision

Viewing changes to src/actionplugins/networkpanu/networkpanu.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2013-12-03 15:43:44 UTC
  • mfrom: (2.1.21 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131203154344-dvo77owmu056l64k
Tags: 1.3.2-0ubuntu1~ubuntu13.10
https://launchpad.net/bugs/1220779
Saucy update using KDE micro release exception LP: #1220779

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/actionplugins/networkpanu/networkpanu.cpp
26
26
#include <KStandardDirs>
27
27
 
28
28
#include <QDebug>
 
29
#include <QDBusConnection>
 
30
#include <QDBusConnectionInterface>
29
31
 
30
32
#include <bluedevil/bluedevildevice.h>
31
33
 
39
41
 
40
42
void NetworkPANUPlugin::startAction()
41
43
{
42
 
    QString deviceInfo;
43
 
    deviceInfo = deviceInfo.append("%1 %2").arg(device()->address()).arg("nap");
44
 
 
45
 
    QStringList args;
46
 
    args << "create" << "--type" <<  "bluetooth" << "--specific-args" << deviceInfo;
47
 
    KProcess p;
48
 
    p.setProgram(KStandardDirs::findExe("networkmanagement_configshell"), args);
49
 
    p.startDetached();
 
44
    const QString bdAddress = device()->address();
 
45
 
 
46
    if (QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.plasmanm")) {
 
47
        QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.plasmanm", "/org/kde/plasmanm", "org.kde.plasmanm", "addBluetoothConnection");
 
48
        msg << bdAddress;
 
49
        msg << "nap";
 
50
 
 
51
        QDBusConnection::sessionBus().call(msg, QDBus::NoBlock);
 
52
    } else {
 
53
        QString deviceInfo;
 
54
        deviceInfo = deviceInfo.append("%1 %2").arg(bdAddress).arg("nap");
 
55
 
 
56
        QStringList args;
 
57
        args << "create" << "--type" <<  "bluetooth" << "--specific-args" << deviceInfo;
 
58
        KProcess p;
 
59
        p.setProgram(KStandardDirs::findExe("networkmanagement_configshell"), args);
 
60
        p.startDetached();
 
61
    }
50
62
 
51
63
    KNotification::event(
52
64
        KNotification::Notification,