[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=233607d

The following commit has been merged in the master branch:
commit 233607d2465b04fc5be6cce461d1287002c0c50a
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Nov 12 12:58:25 2014 +0100

    Fix build from broken merge
---
 cli/kdeconnect-cli.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp
index 14bd078..5de27f7 100644
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@ -46,7 +46,7 @@ int main(int argc, char** argv)
     parser.addOption(QCommandLineOption("ping-msg", i18n("Same as ping but you can set the message to display"), i18n("message")));
     parser.addOption(QCommandLineOption("share", i18n("Share a file to a said device"), "path"));
     parser.addOption(QCommandLineOption("list-notifications", i18n("Display the notifications on a said device")));
-    parser.addOption(QCommandLineOption(QstringList("device") << "d", i18n("Device ID"), "dev"));
+    parser.addOption(QCommandLineOption(QStringList("device") << "d", i18n("Device ID"), "dev"));
     about.setupCommandLine(&parser);
 
     parser.addHelpOption();
@@ -73,7 +73,7 @@ int main(int argc, char** argv)
                       << ": " << idx.data(DevicesModel::IdModelRole).toString() << ' ' << statusInfo << endl;
         }
         QTextStream(stdout) << devices.rowCount() << " devices found" << endl;
-    } else if(args->isSet("refresh")) {
+    } else if(parser.isSet("refresh")) {
         QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect", "org.kde.kdeconnect.daemon", "forceOnNetworkChange");
         QDBusConnection::sessionBus().call(msg);
     } else {

-- 
kdeconnect packaging