[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:40 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=e7578cc
The following commit has been merged in the master branch:
commit e7578cc1291f3b8cd6cee9f4cd2da63946ae73e9
Author: Aleix Pol <aleixpol at kde.org>
Date: Tue May 31 17:16:01 2016 +0200
Refactor capabilities together with Albert
He is committing a similar patch to kdeconnect-android
---
plugins/battery/batteryplugin.h | 2 +-
plugins/battery/kdeconnect_battery.json | 4 +--
plugins/findmyphone/findmyphoneplugin.h | 2 +-
plugins/findmyphone/kdeconnect_findmyphone.json | 4 +--
plugins/lockdevice/kdeconnect_lockdevice.json | 4 ++-
plugins/lockdevice/lockdeviceplugin.cpp | 4 +--
plugins/lockdevice/lockdeviceplugin.h | 1 +
plugins/mousepad/CMakeLists.txt | 30 ++++++++++++++--------
plugins/mousepad/config-mousepad.h.cmake | 1 +
plugins/mousepad/kdeconnect_mousepad.json | 4 +--
plugins/mousepad/mousepadplugin.cpp | 19 +++++++++++++-
plugins/mousepad/mousepadplugin.h | 6 ++++-
plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 4 +--
plugins/mpriscontrol/mpriscontrolplugin.h | 2 +-
plugins/mprisremote/kdeconnect_mprisremote.json | 4 +--
plugins/mprisremote/mprisremoteplugin.cpp | 14 +++++-----
plugins/mprisremote/mprisremoteplugin.h | 2 +-
.../notifications/kdeconnect_notifications.json | 4 +--
.../notifications/notificationsdbusinterface.cpp | 4 +--
plugins/notifications/notificationsplugin.cpp | 2 +-
plugins/notifications/notificationsplugin.h | 3 ++-
.../remotecontrol/kdeconnect_remotecontrol.json | 4 +--
plugins/remotecontrol/remotecontrolplugin.cpp | 4 +--
plugins/remotecontrol/remotecontrolplugin.h | 2 +-
plugins/runcommand/kdeconnect_runcommand.json | 4 +--
.../kdeconnect_sendnotifications.json | 4 +--
.../sendnotifications/notificationslistener.cpp | 2 +-
.../sendnotifications/sendnotificationsplugin.h | 2 +-
plugins/sftp/kdeconnect_sftp.json | 4 +--
plugins/sftp/sftpplugin.h | 2 +-
plugins/share/kdeconnect_share.json | 6 ++---
plugins/share/shareplugin.h | 2 +-
plugins/telephony/kdeconnect_telephony.json | 5 ++--
plugins/telephony/telephonyplugin.cpp | 2 +-
plugins/telephony/telephonyplugin.h | 3 ++-
35 files changed, 102 insertions(+), 64 deletions(-)
diff --git a/plugins/battery/batteryplugin.h b/plugins/battery/batteryplugin.h
index c643f04..e50e8eb 100644
--- a/plugins/battery/batteryplugin.h
+++ b/plugins/battery/batteryplugin.h
@@ -24,7 +24,7 @@
#include <QLoggingCategory>
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_BATTERY QLatin1String("kdeconnect.battery")
+#define PACKAGE_TYPE_BATTERY QLatin1String("kdeconnect.battery.request")
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_BATTERY)
class BatteryDbusInterface;
diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json
index c02b83a..eb67008 100644
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@@ -67,9 +67,9 @@
"Website": "http://albertvaka.wordpress.com"
},
"X-KdeConnect-OutgoingPackageType": [
- "kdeconnect.battery"
+ "kdeconnect.battery.request"
],
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.battery"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/findmyphone/findmyphoneplugin.h b/plugins/findmyphone/findmyphoneplugin.h
index 03d15a6..6853670 100644
--- a/plugins/findmyphone/findmyphoneplugin.h
+++ b/plugins/findmyphone/findmyphoneplugin.h
@@ -25,7 +25,7 @@
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_FINDMYPHONE QStringLiteral("kdeconnect.findmyphone")
+#define PACKAGE_TYPE_FINDMYPHONE QStringLiteral("kdeconnect.findmyphone.request")
class FindMyPhonePlugin
: public KdeConnectPlugin
diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json
index 1d7d10c..213f209 100644
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@ -47,6 +47,6 @@
"Website": "http://kde.org"
},
"X-KdeConnect-OutgoingPackageType": [
- "kdeconnect.findmyphone"
+ "kdeconnect.findmyphone.request"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index b163b48..cf00f95 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -64,9 +64,11 @@
"Website": "https://kde.org"
},
"X-KdeConnect-OutgoingPackageType": [
+ "kdeconnect.lock.request",
"kdeconnect.lock"
],
"X-KdeConnect-SupportedPackageType": [
+ "kdeconnect.lock.request",
"kdeconnect.lock"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/lockdevice/lockdeviceplugin.cpp b/plugins/lockdevice/lockdeviceplugin.cpp
index a24b66b..d486260 100644
--- a/plugins/lockdevice/lockdeviceplugin.cpp
+++ b/plugins/lockdevice/lockdeviceplugin.cpp
@@ -52,7 +52,7 @@ bool LockDevicePlugin::isLocked() const
}
void LockDevicePlugin::setLocked(bool locked)
{
- NetworkPackage np(PACKAGE_TYPE_LOCK);
+ NetworkPackage np(PACKAGE_TYPE_LOCK_REQUEST);
np.set("setLocked", locked);
sendPackage(np);
}
@@ -95,7 +95,7 @@ void LockDevicePlugin::connected()
{
QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllContents);
- NetworkPackage np(PACKAGE_TYPE_LOCK);
+ NetworkPackage np(PACKAGE_TYPE_LOCK_REQUEST);
np.set("requestLocked", QVariant());
sendPackage(np);
}
diff --git a/plugins/lockdevice/lockdeviceplugin.h b/plugins/lockdevice/lockdeviceplugin.h
index 834ae3a..b1672ce 100644
--- a/plugins/lockdevice/lockdeviceplugin.h
+++ b/plugins/lockdevice/lockdeviceplugin.h
@@ -28,6 +28,7 @@
class OrgFreedesktopScreenSaverInterface;
#define PACKAGE_TYPE_LOCK QLatin1String("kdeconnect.lock")
+#define PACKAGE_TYPE_LOCK_REQUEST QLatin1String("kdeconnect.lock.request")
class Q_DECL_EXPORT LockDevicePlugin
: public KdeConnectPlugin
diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
index 85798af..f76ce51 100644
--- a/plugins/mousepad/CMakeLists.txt
+++ b/plugins/mousepad/CMakeLists.txt
@@ -1,22 +1,32 @@
-set(kdeconnect_mousepad_SRCS
- mousepadplugin.cpp
-)
+find_package(LibFakeKey)
+set_package_properties(LibFakeKey PROPERTIES DESCRIPTION "fake key events"
+ URL "https://www.yoctoproject.org/tools-resources/projects/matchbox"
+ TYPE OPTIONAL
+ PURPOSE "Needed for the remote mousepad plugin"
+ )
-find_package(XTest REQUIRED)
-find_package(X11 REQUIRED)
-find_package(LibFakeKey REQUIRED)
-find_package(Qt5X11Extras REQUIRED)
+if (LibFakeKey_FOUND)
+ find_package(XTest REQUIRED)
+ find_package(X11 REQUIRED)
+ find_package(Qt5X11Extras REQUIRED)
+endif()
find_package(KF5Wayland 5.3.90)
+set(HAVE_X11 ${LibFakeKey_FOUND})
set(HAVE_WAYLAND ${KF5Wayland_FOUND})
configure_file(config-mousepad.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-mousepad.h )
-kdeconnect_add_plugin(kdeconnect_mousepad JSON kdeconnect_mousepad.json SOURCES ${kdeconnect_mousepad_SRCS})
+kdeconnect_add_plugin(kdeconnect_mousepad JSON kdeconnect_mousepad.json SOURCES mousepadplugin.cpp)
-include_directories(${XTEST_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ${LibFakeKey_INCLUDE_DIRS})
+if (HAVE_X11)
+ include_directories(${XTEST_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ${LibFakeKey_INCLUDE_DIRS})
+endif()
-target_link_libraries(kdeconnect_mousepad kdeconnectcore Qt5::Gui Qt5::X11Extras ${X11_LIBRARIES} ${XTEST_LIBRARIES} ${LibFakeKey_LIBRARIES} KF5::I18n)
+target_link_libraries(kdeconnect_mousepad kdeconnectcore Qt5::Gui KF5::I18n)
if(HAVE_WAYLAND)
target_link_libraries(kdeconnect_mousepad KF5::WaylandClient)
endif()
+if(HAVE_X11)
+ target_link_libraries(kdeconnect_mousepad Qt5::X11Extras ${X11_LIBRARIES} ${XTEST_LIBRARIES} ${LibFakeKey_LIBRARIES})
+endif()
diff --git a/plugins/mousepad/config-mousepad.h.cmake b/plugins/mousepad/config-mousepad.h.cmake
index e683004..e962b6a 100644
--- a/plugins/mousepad/config-mousepad.h.cmake
+++ b/plugins/mousepad/config-mousepad.h.cmake
@@ -1 +1,2 @@
#cmakedefine01 HAVE_WAYLAND
+#cmakedefine01 HAVE_X11
diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json
index e90d213..463ff09 100644
--- a/plugins/mousepad/kdeconnect_mousepad.json
+++ b/plugins/mousepad/kdeconnect_mousepad.json
@@ -67,6 +67,6 @@
},
"X-KdeConnect-OutgoingPackageType": [],
"X-KdeConnect-SupportedPackageType": [
- "kdeconnect.mousepad"
+ "kdeconnect.input.request"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/mousepad/mousepadplugin.cpp b/plugins/mousepad/mousepadplugin.cpp
index cc172ab..ac9eaa0 100644
--- a/plugins/mousepad/mousepadplugin.cpp
+++ b/plugins/mousepad/mousepadplugin.cpp
@@ -24,10 +24,13 @@
#include <KLocalizedString>
#include <QDebug>
#include <QGuiApplication>
+
+#if HAVE_X11
#include <QX11Info>
#include <X11/extensions/XTest.h>
#include <X11/keysym.h>
#include <fakekey/fakekey.h>
+#endif
#if HAVE_WAYLAND
#include <KWayland/Client/connection_thread.h>
@@ -45,6 +48,7 @@ enum MouseButtons {
MouseWheelDown = 5
};
+#if HAVE_X11
//Translation table to keep in sync within all the implementations
int SpecialKeysMap[] = {
0, // Invalid
@@ -81,12 +85,19 @@ int SpecialKeysMap[] = {
XK_F11, // 31
XK_F12, // 32
};
+#endif
template <typename T, size_t N>
size_t arraySize(T(&arr)[N]) { (void)arr; return N; }
MousepadPlugin::MousepadPlugin(QObject* parent, const QVariantList& args)
- : KdeConnectPlugin(parent, args), m_fakekey(nullptr), m_x11(QX11Info::isPlatformX11())
+ : KdeConnectPlugin(parent, args)
+#if HAVE_X11
+ , m_fakekey(nullptr)
+ , m_x11(QX11Info::isPlatformX11())
+#else
+ , m_x11(false)
+#endif
#if HAVE_WAYLAND
, m_waylandInput(nullptr)
, m_waylandAuthenticationRequested(false)
@@ -99,17 +110,21 @@ MousepadPlugin::MousepadPlugin(QObject* parent, const QVariantList& args)
MousepadPlugin::~MousepadPlugin()
{
+#if HAVE_X11
if (m_fakekey) {
free(m_fakekey);
m_fakekey = nullptr;
}
+#endif
}
bool MousepadPlugin::receivePackage(const NetworkPackage& np)
{
+#if HAVE_X11
if (m_x11) {
return handlePackageX11(np);
}
+#endif
#if HAVE_WAYLAND
if (m_waylandInput) {
if (!m_waylandAuthenticationRequested) {
@@ -122,6 +137,7 @@ bool MousepadPlugin::receivePackage(const NetworkPackage& np)
return false;
}
+#if HAVE_X11
bool MousepadPlugin::handlePackageX11(const NetworkPackage &np)
{
//qDebug() << np.serialize();
@@ -229,6 +245,7 @@ bool MousepadPlugin::handlePackageX11(const NetworkPackage &np)
}
return true;
}
+#endif
#if HAVE_WAYLAND
void MousepadPlugin::setupWaylandIntegration()
diff --git a/plugins/mousepad/mousepadplugin.h b/plugins/mousepad/mousepadplugin.h
index 110f58e..da8fad8 100644
--- a/plugins/mousepad/mousepadplugin.h
+++ b/plugins/mousepad/mousepadplugin.h
@@ -25,7 +25,7 @@
#include <core/kdeconnectplugin.h>
#include <config-mousepad.h>
-#define PACKAGE_TYPE_MOUSEPAD QLatin1String("kdeconnect.mousepad")
+#define PACKAGE_TYPE_INPUT_REQUEST QLatin1String("kdeconnect.input.request")
struct FakeKey;
@@ -52,13 +52,17 @@ public:
virtual void connected() override { }
private:
+#if HAVE_X11
bool handlePackageX11(const NetworkPackage& np);
+#endif
#if HAVE_WAYLAND
void setupWaylandIntegration();
bool handPackageWayland(const NetworkPackage& np);
#endif
+#if HAVE_X11
FakeKey* m_fakekey;
+#endif
const bool m_x11;
#if HAVE_WAYLAND
KWayland::Client::FakeInput *m_waylandInput;
diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
index 872ce37..5cfeb88 100644
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@@ -70,6 +70,6 @@
"kdeconnect.mpris"
],
"X-KdeConnect-SupportedPackageType": [
- "kdeconnect.mpris"
+ "kdeconnect.mpris.request"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/mpriscontrol/mpriscontrolplugin.h b/plugins/mpriscontrol/mpriscontrolplugin.h
index f61438a..9a963f5 100644
--- a/plugins/mpriscontrol/mpriscontrolplugin.h
+++ b/plugins/mpriscontrol/mpriscontrolplugin.h
@@ -28,7 +28,7 @@
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_MPRIS QLatin1String("kdeconnect.mpris")
+#define PACKAGE_TYPE_MPRIS QLatin1String("kdeconnect.mpris.request")
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_MPRIS)
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index 50ffc15..8815bde 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -51,9 +51,9 @@
"Website": "https://kde.org"
},
"X-KdeConnect-OutgoingPackageType": [
- "kdeconnect.mpris"
+ "kdeconnect.mpris.request"
],
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.mpris"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/mprisremote/mprisremoteplugin.cpp b/plugins/mprisremote/mprisremoteplugin.cpp
index 4f2e340..c9be7da 100644
--- a/plugins/mprisremote/mprisremoteplugin.cpp
+++ b/plugins/mprisremote/mprisremoteplugin.cpp
@@ -52,7 +52,7 @@ MprisRemotePlugin::~MprisRemotePlugin()
bool MprisRemotePlugin::receivePackage(const NetworkPackage& np)
{
- if (np.type() != PACKAGE_TYPE_MPRIS)
+ if (np.type() != PACKAGE_TYPE_MPRIS_REQUEST)
return false;
if (np.has("nowPlaying") || np.has("volume") || np.has("isPlaying") || np.has("length") || np.has("pos")) {
@@ -97,7 +97,7 @@ QString MprisRemotePlugin::dbusPath() const
void MprisRemotePlugin::requestPlayerStatus()
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS);
+ NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST);
np.set("player",m_player);
np.set("requestNowPlaying",true);
np.set("requestVolume",true);
@@ -106,14 +106,14 @@ void MprisRemotePlugin::requestPlayerStatus()
void MprisRemotePlugin::requestPlayerList()
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS);
+ NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST);
np.set("requestPlayerList", true);
sendPackage(np);
}
void MprisRemotePlugin::sendAction(const QString& action)
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS);
+ NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST);
np.set("player", m_player);
np.set("action", action);
sendPackage(np);
@@ -121,7 +121,7 @@ void MprisRemotePlugin::sendAction(const QString& action)
void MprisRemotePlugin::seek(int offset) const
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS);
+ NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST);
np.set("player", m_player);
np.set("Seek", offset);
sendPackage(np);
@@ -129,7 +129,7 @@ void MprisRemotePlugin::seek(int offset) const
void MprisRemotePlugin::setVolume(int volume)
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS);
+ NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST);
np.set("player", m_player);
np.set("setVolume",volume);
sendPackage(np);
@@ -137,7 +137,7 @@ void MprisRemotePlugin::setVolume(int volume)
void MprisRemotePlugin::setPosition(int position)
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS);
+ NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST);
np.set("player", m_player);
np.set("SetPosition", position);
sendPackage(np);
diff --git a/plugins/mprisremote/mprisremoteplugin.h b/plugins/mprisremote/mprisremoteplugin.h
index 886e6c5..606eae1 100644
--- a/plugins/mprisremote/mprisremoteplugin.h
+++ b/plugins/mprisremote/mprisremoteplugin.h
@@ -25,7 +25,7 @@
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_MPRIS QLatin1String("kdeconnect.mpris")
+#define PACKAGE_TYPE_MPRIS_REQUEST QLatin1String("kdeconnect.mpris.request")
class Q_DECL_EXPORT MprisRemotePlugin
: public KdeConnectPlugin
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index ee7a3ec..52bb3df 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -21,9 +21,9 @@
"Website": "http://albertvaka.wordpress.com"
},
"X-KdeConnect-OutgoingPackageType": [
- "kdeconnect.notification"
+ "kdeconnect.notification.request"
],
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.notification"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/notifications/notificationsdbusinterface.cpp b/plugins/notifications/notificationsdbusinterface.cpp
index 6f55db0..d3ccc2d 100644
--- a/plugins/notifications/notificationsdbusinterface.cpp
+++ b/plugins/notifications/notificationsdbusinterface.cpp
@@ -70,7 +70,7 @@ void NotificationsDbusInterface::processPackage(const NetworkPackage& np)
removeNotification(id);
} else if (np.get<bool>("isRequest")) {
for (const auto& n: mNotifications) {
- NetworkPackage np(PACKAGE_TYPE_NOTIFICATION);
+ NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REQUEST);
np.set("id", n->internalId());
np.set("appName", n->appName());
np.set("ticker", n->ticker());
@@ -152,7 +152,7 @@ void NotificationsDbusInterface::removeNotification(const QString& internalId)
void NotificationsDbusInterface::dismissRequested(const QString& internalId)
{
- NetworkPackage np(PACKAGE_TYPE_NOTIFICATION);
+ NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REQUEST);
np.set<QString>("cancel", internalId);
mPlugin->sendPackage(np);
diff --git a/plugins/notifications/notificationsplugin.cpp b/plugins/notifications/notificationsplugin.cpp
index a21daaf..5cc281d 100644
--- a/plugins/notifications/notificationsplugin.cpp
+++ b/plugins/notifications/notificationsplugin.cpp
@@ -37,7 +37,7 @@ NotificationsPlugin::NotificationsPlugin(QObject* parent, const QVariantList& ar
void NotificationsPlugin::connected()
{
- NetworkPackage np(PACKAGE_TYPE_NOTIFICATION);
+ NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REQUEST);
np.set("request", true);
sendPackage(np);
}
diff --git a/plugins/notifications/notificationsplugin.h b/plugins/notifications/notificationsplugin.h
index a0e2405..46bd1e2 100644
--- a/plugins/notifications/notificationsplugin.h
+++ b/plugins/notifications/notificationsplugin.h
@@ -24,7 +24,8 @@
#include <knotification.h>
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_NOTIFICATION QLatin1String("kdeconnect.notification")
+
+#define PACKAGE_TYPE_NOTIFICATION_REQUEST QLatin1String("kdeconnect.notification.request")
/*
* This class is just a proxy for NotificationsDbusInterface
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 819497c..e283f77 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -64,7 +64,7 @@
"Website": "https://kde.org"
},
"X-KdeConnect-OutgoingPackageType": [
- "kdeconnect.mousepad"
+ "kdeconnect.input.request"
],
"X-KdeConnect-SupportedPackageType": []
-}
\ No newline at end of file
+}
diff --git a/plugins/remotecontrol/remotecontrolplugin.cpp b/plugins/remotecontrol/remotecontrolplugin.cpp
index 02469f8..283e342 100644
--- a/plugins/remotecontrol/remotecontrolplugin.cpp
+++ b/plugins/remotecontrol/remotecontrolplugin.cpp
@@ -44,7 +44,7 @@ RemoteControlPlugin::~RemoteControlPlugin()
void RemoteControlPlugin::moveCursor(const QPoint &p)
{
- NetworkPackage np(PACKAGE_TYPE_MOUSEPAD);
+ NetworkPackage np(PACKAGE_TYPE_INPUT_REQUEST);
np.set("dx", p.x());
np.set("dy", p.y());
sendPackage(np);
@@ -52,7 +52,7 @@ void RemoteControlPlugin::moveCursor(const QPoint &p)
void RemoteControlPlugin::sendCommand(const QString &name, bool val)
{
- NetworkPackage np(PACKAGE_TYPE_MOUSEPAD);
+ NetworkPackage np(PACKAGE_TYPE_INPUT_REQUEST);
np.set(name, val);
sendPackage(np);
}
diff --git a/plugins/remotecontrol/remotecontrolplugin.h b/plugins/remotecontrol/remotecontrolplugin.h
index 96d0269..7236fdd 100644
--- a/plugins/remotecontrol/remotecontrolplugin.h
+++ b/plugins/remotecontrol/remotecontrolplugin.h
@@ -25,7 +25,7 @@
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_MOUSEPAD QLatin1String("kdeconnect.mousepad")
+#define PACKAGE_TYPE_INPUT_REQUEST QLatin1String("kdeconnect.input.request")
class Q_DECL_EXPORT RemoteControlPlugin
: public KdeConnectPlugin
diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json
index b38b6de..0e82d8b 100644
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@@ -71,6 +71,6 @@
"kdeconnect.runcommand"
],
"X-KdeConnect-SupportedPackageType": [
- "kdeconnect.runcommand"
+ "kdeconnect.runcommand.request"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json
index 8eb68a6..4cec226 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications.json
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json
@@ -24,6 +24,6 @@
"kdeconnect.notification"
],
"X-KdeConnect-SupportedPackageType": [
- "kdeconnect.notification"
+ "kdeconnect.notification.request"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/sendnotifications/notificationslistener.cpp b/plugins/sendnotifications/notificationslistener.cpp
index 9a51167..977d7a8 100644
--- a/plugins/sendnotifications/notificationslistener.cpp
+++ b/plugins/sendnotifications/notificationslistener.cpp
@@ -144,7 +144,7 @@ uint NotificationsListener::Notify(const QString &appName, uint replacesId,
return 0;
//qCDebug(KDECONNECT_PLUGIN_SENDNOTIFICATION) << "Sending notification from" << appName << ":" <<ticker << "; appIcon=" << appIcon;
- NetworkPackage np(PACKAGE_TYPE_NOTIFICATION);
+ NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REQUEST);
np.set("id", QString::number(replacesId > 0 ? replacesId : ++id));
np.set("appName", appName);
np.set("ticker", ticker);
diff --git a/plugins/sendnotifications/sendnotificationsplugin.h b/plugins/sendnotifications/sendnotificationsplugin.h
index fcb8935..b724758 100644
--- a/plugins/sendnotifications/sendnotificationsplugin.h
+++ b/plugins/sendnotifications/sendnotificationsplugin.h
@@ -24,7 +24,7 @@
#include <knotification.h>
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_NOTIFICATION QLatin1String("kdeconnect.notification")
+#define PACKAGE_TYPE_NOTIFICATION_REQUEST QLatin1String("kdeconnect.notification")
/*
* This class is just a proxy for NotificationsDbusInterface
diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json
index afc8b2c..5555b39 100644
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@@ -68,9 +68,9 @@
"Website": "http://albertvaka.wordpress.com"
},
"X-KdeConnect-OutgoingPackageType": [
- "kdeconnect.sftp"
+ "kdeconnect.sftp.request"
],
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.sftp"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/sftp/sftpplugin.h b/plugins/sftp/sftpplugin.h
index 011ed22..49aea49 100644
--- a/plugins/sftp/sftpplugin.h
+++ b/plugins/sftp/sftpplugin.h
@@ -24,7 +24,7 @@
#include <core/kdeconnectplugin.h>
#include <core/device.h>
-#define PACKAGE_TYPE_SFTP QLatin1String("kdeconnect.sftp")
+#define PACKAGE_TYPE_SFTP QLatin1String("kdeconnect.sftp.request")
class KNotification;
diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json
index 804255b..384d711 100644
--- a/plugins/share/kdeconnect_share.json
+++ b/plugins/share/kdeconnect_share.json
@@ -67,9 +67,9 @@
"Website": "http://albertvaka.wordpress.com"
},
"X-KdeConnect-OutgoingPackageType": [
- "kdeconnect.share"
+ "kdeconnect.share.request"
],
"X-KdeConnect-SupportedPackageType": [
- "kdeconnect.share"
+ "kdeconnect.share.request"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/share/shareplugin.h b/plugins/share/shareplugin.h
index 4149e21..43bb954 100644
--- a/plugins/share/shareplugin.h
+++ b/plugins/share/shareplugin.h
@@ -26,7 +26,7 @@
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_SHARE QLatin1String("kdeconnect.share")
+#define PACKAGE_TYPE_SHARE QLatin1String("kdeconnect.share.request")
class SharePlugin
: public KdeConnectPlugin
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index e32a5c1..34cf45f 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -67,9 +67,10 @@
"Website": "http://albertvaka.wordpress.com"
},
"X-KdeConnect-OutgoingPackageType": [
- "kdeconnect.telephony"
+ "kdeconnect.telephony.request",
+ "kdeconnect.sms.request"
],
"X-KdeConnect-SupportedPackageType": [
"kdeconnect.telephony"
]
-}
\ No newline at end of file
+}
diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp
index 449a22d..239f80d 100644
--- a/plugins/telephony/telephonyplugin.cpp
+++ b/plugins/telephony/telephonyplugin.cpp
@@ -144,7 +144,7 @@ void TelephonyPlugin::sendMutePackage()
void TelephonyPlugin::sendSms(const QString& phoneNumber, const QString& messageBody)
{
- NetworkPackage np(PACKAGE_TYPE_TELEPHONY);
+ NetworkPackage np(PACKAGE_TYPE_SMS);
np.set("sendSms", true);
np.set("phoneNumber", phoneNumber);
np.set("messageBody", messageBody);
diff --git a/plugins/telephony/telephonyplugin.h b/plugins/telephony/telephonyplugin.h
index 231b0c7..95300a2 100644
--- a/plugins/telephony/telephonyplugin.h
+++ b/plugins/telephony/telephonyplugin.h
@@ -31,7 +31,8 @@
#include "kdeconnecttelepathyprotocolfactory.h"
#endif
-#define PACKAGE_TYPE_TELEPHONY QLatin1String("kdeconnect.telephony")
+#define PACKAGE_TYPE_TELEPHONY QLatin1String("kdeconnect.telephony.request")
+#define PACKAGE_TYPE_SMS QLatin1String("kdeconnect.sms.request")
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_TELEPHONY)
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list