tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable'

Browse source
This commit is contained in:
Aleix Pol 2015-09-11 12:24:15 +02:00
commit ca4a81b8e8
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cli/kdeconnect-cli.cpp
View file

@ -110,9 +110,8 @@ int main(int argc, char** argv)
QTextStream(stderr) << i18n("No device specified") << endl;
}
device = parser.value("device");
QUrl url;
if(parser.isSet("share")) {
url = QUrl::fromUserInput(parser.value("share"), QDir::currentPath());
QUrl url = QUrl::fromUserInput(parser.value("share"), QDir::currentPath());
parser.clearPositionalArguments();
if(!url.isEmpty() && !device.isEmpty()) {
QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+device+"/share", "org.kde.kdeconnect.device.share", "shareUrl");

2
core/filetransferjob.cpp
View file

@ -80,7 +80,7 @@ void FileTransferJob::startTransfer()
mTime = QTime::currentTime();
description(this, i18n("Receiving file over KDE-Connect"),
QPair<QString, QString>(i18nc("File transfer origin", "From"),
QString(mDeviceName)),
mDeviceName),
QPair<QString, QString>(i18nc("File transfer destination", "To"), mDestination.toLocalFile()));
mReply = Daemon::instance()->networkAccessManager()->put(QNetworkRequest(mDestination), mOrigin.data());

4
core/networkpackage.cpp
View file

@ -59,8 +59,8 @@ void NetworkPackage::createIdentityPackage(NetworkPackage* np)
np->set("deviceName", config->name());
np->set("deviceType", config->deviceType());
np->set("protocolVersion", NetworkPackage::ProtocolVersion);
np->set("SupportedIncomingInterfaces", PluginLoader::instance()->incomingInterfaces().join(","));
np->set("SupportedOutgoingInterfaces", PluginLoader::instance()->outgoingInterfaces().join(","));
np->set("SupportedIncomingInterfaces", PluginLoader::instance()->incomingInterfaces());
np->set("SupportedOutgoingInterfaces", PluginLoader::instance()->outgoingInterfaces());
//qCDebug(KDECONNECT_CORE) << "createIdentityPackage" << np->serialize();
}