[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=9aa794b
The following commit has been merged in the master branch:
commit 9aa794b0daa706d2cf646f521eed9a1ef1ab7176
Merge: 3f82eb9cc7069e7dbfb8ad2aa947697a230886d5 e7578cc1291f3b8cd6cee9f4cd2da63946ae73e9
Author: Aleix Pol <aleixpol at kde.org>
Date: Tue May 31 17:29:06 2016 +0200
Merge branch 'master' into sslrefactor
core/networkpackage.cpp | 1 +
fileitemactionplugin/kdeconnectsendfile.desktop | 2 +-
plasmoid/package/contents/ui/DeviceDelegate.qml | 8 +++-
.../package/contents/ui/FullRepresentation.qml | 4 +-
plugins/CMakeLists.txt | 1 +
plugins/battery/batteryplugin.h | 2 +-
plugins/battery/kdeconnect_battery.json | 4 +-
plugins/findmyphone/findmyphoneplugin.h | 2 +-
plugins/findmyphone/kdeconnect_findmyphone.json | 29 ++----------
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 +-
plugins/notifications/CMakeLists.txt | 23 ---------
.../notifications/kdeconnect_notifications.json | 54 ++--------------------
.../notifications/notificationsdbusinterface.cpp | 4 +-
plugins/notifications/notificationsplugin.cpp | 4 +-
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 +-
plugins/sendnotifications/CMakeLists.txt | 38 +++++++++++++++
.../kdeconnect_sendnotifications.json | 29 ++++++++++++
.../kdeconnect_sendnotifications_config.desktop} | 4 +-
.../notificationslistener.cpp | 31 ++++++-------
.../notificationslistener.h | 5 +-
.../notifyingapplication.cpp | 0
.../notifyingapplication.h | 0
.../notifyingapplicationmodel.cpp | 0
.../notifyingapplicationmodel.h | 0
.../sendnotification_debug.h} | 6 +--
.../sendnotifications_config.cpp} | 24 +++++-----
.../sendnotifications_config.h} | 14 +++---
.../sendnotifications_config.ui} | 4 +-
.../sendnotifications/sendnotificationsplugin.cpp | 40 ++++++++--------
.../sendnotificationsplugin.h} | 13 +++---
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 +-
tests/CMakeLists.txt | 8 ++--
tests/testnotificationlistener.cpp | 24 ++++------
55 files changed, 260 insertions(+), 254 deletions(-)
diff --cc plugins/notifications/CMakeLists.txt
index 464811e,6f7eb72..ecf3251
--- a/plugins/notifications/CMakeLists.txt
+++ b/plugins/notifications/CMakeLists.txt
@@@ -16,26 -14,4 +14,5 @@@ target_link_libraries(kdeconnect_notifi
KF5::Notifications
KF5::I18n
KF5::IconThemes
+ KF5::ConfigCore
)
-
- #######################################
- # Config
-
- set( kdeconnect_notifications_config_SRCS
- notifications_config.cpp
- notifyingapplication.cpp
- notifyingapplicationmodel.cpp
- )
- ki18n_wrap_ui( kdeconnect_notifications_config_SRCS notifications_config.ui )
-
- add_library(kdeconnect_notifications_config MODULE ${kdeconnect_notifications_config_SRCS} )
- target_link_libraries( kdeconnect_notifications_config
- kdeconnectcore
- kdeconnectpluginkcm
- KF5::I18n
- KF5::KCMUtils
- )
-
- install( TARGETS kdeconnect_notifications_config DESTINATION ${PLUGIN_INSTALL_DIR} )
- install( FILES kdeconnect_notifications_config.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --cc plugins/sendnotifications/notificationslistener.cpp
index 34a9191,977d7a8..6e7faff
--- a/plugins/sendnotifications/notificationslistener.cpp
+++ b/plugins/sendnotifications/notificationslistener.cpp
@@@ -116,10 -95,10 +113,10 @@@ uint NotificationsListener::Notify(cons
static int id = 0;
Q_UNUSED(actions);
- //qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Got notification appName=" << appName << "replacesId=" << replacesId << "appIcon=" << appIcon << "summary=" << summary << "body=" << body << "actions=" << actions << "hints=" << hints << "timeout=" << timeout;
+ //qCDebug(KDECONNECT_PLUGIN_SENDNOTIFICATION) << "Got notification appName=" << appName << "replacesId=" << replacesId << "appIcon=" << appIcon << "summary=" << summary << "body=" << body << "actions=" << actions << "hints=" << hints << "timeout=" << timeout;
// skip our own notifications
- if (appName == QLatin1String("KDE Connect"))
+ if (appName == mTranslatedAppName)
return 0;
NotifyingApplication app;
diff --cc tests/CMakeLists.txt
index b9e6a00,54d7e09..1d45b86
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@@ -19,48 -17,11 +19,46 @@@ set(kdeconnect_librarie
ecm_add_test(pluginloadtest.cpp LINK_LIBRARIES ${kdeconnect_libraries})
ecm_add_test(sendfiletest.cpp LINK_LIBRARIES ${kdeconnect_libraries})
ecm_add_test(networkpackagetests.cpp LINK_LIBRARIES ${kdeconnect_libraries})
-ecm_add_test(testsocketlinereader.cpp ../core/backends/lan/socketlinereader.cpp TEST_NAME testsocketlinereader LINK_LIBRARIES ${kdeconnect_libraries})
+
+ecm_add_test(testsocketlinereader.cpp ../core/backends/lan/socketlinereader.cpp ../core/backends/lan/server.cpp TEST_NAME testsocketlinereader LINK_LIBRARIES ${kdeconnect_libraries})
+
+set(testsslsocketlinereader_sources
+ ../core/backends/lan/server.cpp
+ ../core/backends/lan/socketlinereader.cpp
+)
+ecm_add_test(testsslsocketlinereader.cpp ${testsslsocketlinereader_sources} TEST_NAME testsslsocketlinereader LINK_LIBRARIES ${kdeconnect_libraries})
+
+set(kdeconnectconfigtest_sources
+ ../core/backends/devicelink.cpp
+ ../core/backends/pairinghandler.cpp
+ ../core/dbushelper.cpp
+ ../core/device.cpp
+ ../core/pluginloader.cpp
+)
+ecm_add_test(kdeconnectconfigtest.cpp ${kdeconnectconfigtest_sources} TEST_NAME kdeconnectconfigtest LINK_LIBRARIES ${kdeconnect_libraries})
+
+set(lanlinkprovidertest_sources
+ ../core/backends/devicelink.cpp
+ ../core/backends/lan/downloadjob.cpp
+ ../core/backends/lan/landevicelink.cpp
+ ../core/backends/lan/lanlinkprovider.cpp
+ ../core/backends/lan/lanpairinghandler.cpp
+ ../core/backends/lan/server.cpp
+ ../core/backends/lan/socketlinereader.cpp
+ ../core/backends/lan/uploadjob.cpp
+ ../core/backends/linkprovider.cpp
+ ../core/backends/pairinghandler.cpp
+ ../core/device.cpp
+ ../core/pluginloader.cpp
+)
+ecm_add_test(lanlinkprovidertest.cpp ${lanlinkprovidertest_sources} TEST_NAME lanlinkprovidertest LINK_LIBRARIES ${kdeconnect_libraries})
+
+ecm_add_test(devicetest.cpp ${lanlinkprovidertest_sources} TEST_NAME devicetest LINK_LIBRARIES ${kdeconnect_libraries})
+
ecm_add_test(downloadjobtest.cpp ../core/backends/lan/downloadjob.cpp TEST_NAME downloadjobtest LINK_LIBRARIES ${kdeconnect_libraries})
ecm_add_test(testnotificationlistener.cpp
- ../plugins/notifications/notificationslistener.cpp
- ../plugins/notifications/notificationsplugin.cpp
- ../plugins/notifications/notification.cpp
- ../plugins/notifications/notifyingapplication.cpp
- ../plugins/notifications/notificationsdbusinterface.cpp
+ ../plugins/sendnotifications/sendnotificationsplugin.cpp
+ ../plugins/sendnotifications/notificationslistener.cpp
+ ../plugins/sendnotifications/notifyingapplication.cpp
TEST_NAME testnotificationlistener
LINK_LIBRARIES ${kdeconnect_libraries} Qt5::DBus KF5::Notifications KF5::IconThemes)
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list