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

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:28:23 UTC 2016


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

The following commit has been merged in the master branch:
commit ccf03f16d1f8dbc41012e4295507dd6994ee19b3
Merge: 0f3c1ef7c75c3a108b5f73488f27bc3929a26043 c7cee37330ca1a477a936eeb3a885886e68b90b8
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Mar 19 17:23:27 2015 +0100

    Merge branch 'frameworks' to master
    
    The last version using qt/kde4 was moved into the kde4 branch.
    
    CCMAIL: kdeconnect at kde.org

 CMakeLists.txt                                     |  39 ++-
 KDEConnectMacros.cmake                             |  35 +++
 cli/CMakeLists.txt                                 |   3 +-
 cli/kdeconnect-cli.cpp                             | 154 ++++++-----
 cmake/DbusInterfaceMacros.cmake                    |  29 +-
 core/CMakeLists.txt                                |  42 +--
 core/backends/devicelink.cpp                       |   3 +
 core/backends/devicelink.h                         |   4 +-
 core/backends/lan/CMakeLists.txt                   |   4 +-
 core/backends/lan/landevicelink.cpp                |   5 +-
 core/backends/lan/lanlinkprovider.cpp              |  33 +--
 core/backends/lan/uploadjob.cpp                    |   4 +-
 core/backends/linkprovider.h                       |   2 +-
 core/backends/loopback/CMakeLists.txt              |   4 +-
 core/backends/loopback/loopbacklinkprovider.cpp    |   2 +-
 core/{kdebugnamespace.h => core_debug.h}           |  15 +-
 core/daemon.cpp                                    | 116 ++------
 core/daemon.h                                      |   5 +-
 core/device.cpp                                    | 157 +++++------
 core/device.h                                      |  29 +-
 core/filetransferjob.cpp                           |  82 ++----
 core/filetransferjob.h                             |  11 +-
 core/kdeconnectconfig.cpp                          | 228 ++++++++++++++++
 core/kdeconnectconfig.h                            |  80 ++++++
 core/kdeconnectplugin.cpp                          |  23 +-
 core/kdeconnectplugin.h                            |   6 +-
 core/kdeconnectpluginconfig.cpp                    |  67 +++++
 core/kdeconnectpluginconfig.h                      |  68 +++++
 core/networkpackage.cpp                            |  91 ++++---
 core/networkpackage.h                              |   6 +-
 core/pluginloader.cpp                              |  58 ++--
 core/pluginloader.h                                |  10 +-
 daemon/CMakeLists.txt                              |  13 +
 {kded => daemon}/Messages.sh                       |   0
 {kded => daemon}/kdeconnect.desktop                |   1 +
 {kded => daemon}/kdeconnectd.cpp                   |  46 +---
 daemon/kdeconnectd.desktop.cmake                   |  10 +
 daemon/org.kde.kdeconnect.service.in               |   3 +
 fileitemactionplugin/CMakeLists.txt                |   5 +-
 fileitemactionplugin/Messages.sh                   |   2 +-
 fileitemactionplugin/sendfileitemaction.cpp        |  15 +-
 fileitemactionplugin/sendfileitemaction.h          |   8 +-
 icon/CMakeLists.txt                                |  15 +-
 interfaces/CMakeLists.txt                          |  52 ++--
 interfaces/dbusinterfaces.cpp                      |  19 +-
 interfaces/dbusinterfaces.h                        |   4 +-
 interfaces/devicesmodel.cpp                        | 114 +++++---
 interfaces/devicesmodel.h                          |  11 +-
 .../interfaces_debug.h                             |  17 +-
 interfaces/modeltest.cpp                           |  16 +-
 interfaces/notificationsmodel.cpp                  |  62 +++--
 interfaces/notificationsmodel.h                    |   4 +
 kcm/CMakeLists.txt                                 |  16 +-
 kcm/devicessortproxymodel.cpp                      |   1 -
 kcm/kcm.cpp                                        |  99 +++++--
 kcm/kcm.h                                          |  17 +-
 kcm/kcm.ui                                         |  65 +++++
 kcm/kcm_kdeconnect.desktop                         |   2 +-
 kcm/kdeconnect.desktop                             |   2 +-
 kcmplugin/CMakeLists.txt                           |  29 ++
 .../kdeconnectpluginkcm.cpp                        |  57 ++--
 .../kdeconnectpluginkcm.h                          |  56 ++--
 kdeconnect-non-plasma.desktop                      |  11 +
 kdeconnect-version.h.in                            |   2 +
 kded/CMakeLists.txt                                |  13 -
 kded/kded.cpp                                      | 118 --------
 kded/kded.h                                        |  57 ----
 kded/org.kde.kdeconnect.service.in                 |   3 -
 kio/CMakeLists.txt                                 |  12 +-
 kio/kiokdeconnect.cpp                              |  44 ++-
 kio/kiokdeconnect.h                                |   9 +-
 plasmoid/CMakeLists.txt                            |   2 +-
 plasmoid/Messages.sh                               |   2 +-
 plasmoid/declarativeplugin/CMakeLists.txt          |  15 +-
 .../kdeconnectdeclarativeplugin.cpp                |  14 +-
 .../kdeconnectdeclarativeplugin.h                  |  13 +-
 plasmoid/declarativeplugin/processrunner.cpp       |  35 +++
 plasmoid/declarativeplugin/processrunner.h         |  36 +++
 plasmoid/declarativeplugin/qmldir                  |   1 +
 plasmoid/declarativeplugin/responsewaiter.h        |   2 -
 plasmoid/package/contents/ui/Battery.qml           |   6 +-
 .../package/contents/ui/CompactRepresentation.qml  |  24 +-
 plasmoid/package/contents/ui/DeviceDelegate.qml    |   6 +-
 .../ui/{kdeconnect.qml => FullRepresentation.qml}  |  55 +---
 plasmoid/package/contents/ui/Sftp.qml              |   6 +-
 plasmoid/package/contents/ui/main.qml              |  66 +++++
 plasmoid/package/metadata.desktop                  |   4 +-
 plugins/CMakeLists.txt                             |   5 +-
 plugins/battery/CMakeLists.txt                     |  13 +-
 plugins/battery/batterydbusinterface.cpp           |   5 +-
 plugins/battery/batteryplugin.cpp                  |  16 +-
 plugins/battery/batteryplugin.h                    |   2 +
 plugins/battery/kdeconnect_battery.desktop         |  63 -----
 plugins/battery/kdeconnect_battery.json            |  69 +++++
 plugins/clipboard/CMakeLists.txt                   |   7 +-
 plugins/clipboard/clipboardplugin.cpp              |  15 +-
 plugins/clipboard/clipboardplugin.h                |   3 +-
 plugins/clipboard/kdeconnect_clipboard.desktop     |  65 -----
 plugins/clipboard/kdeconnect_clipboard.json        |  70 +++++
 plugins/kdeconnect.notifyrc                        |  56 +---
 plugins/mousepad/CMakeLists.txt                    |  12 +-
 plugins/mousepad/fixx11h.h                         | 301 +++++++++++++++++++++
 plugins/mousepad/kdeconnect_mousepad.desktop       |  54 ----
 plugins/mousepad/kdeconnect_mousepad.json          |  59 ++++
 plugins/mousepad/mousepadplugin.cpp                |  15 +-
 plugins/mousepad/mousepadplugin.h                  |   6 +-
 plugins/mpriscontrol/CMakeLists.txt                |  12 +-
 .../mpriscontrol/kdeconnect_mpriscontrol.desktop   |  62 -----
 plugins/mpriscontrol/kdeconnect_mpriscontrol.json  |  68 +++++
 plugins/mpriscontrol/mpriscontrolplugin.cpp        |  28 +-
 plugins/mpriscontrol/mpriscontrolplugin.h          |   3 +
 plugins/mpriscontrol/propertiesInterface.xml       |  11 +-
 plugins/notifications/CMakeLists.txt               |  12 +-
 .../notifications/kdeconnect_notifications.desktop |  63 -----
 .../notifications/kdeconnect_notifications.json    |  69 +++++
 plugins/notifications/notification.cpp             |   2 -
 .../notifications/notification_debug.h             |  15 +-
 .../notifications/notificationsdbusinterface.cpp   |  19 +-
 plugins/notifications/notificationsplugin.cpp      |  13 +-
 plugins/pausemusic/CMakeLists.txt                  |  19 +-
 plugins/pausemusic/kdeconnect_pausemusic.desktop   |  61 -----
 plugins/pausemusic/kdeconnect_pausemusic.json      |  67 +++++
 plugins/pausemusic/pausemusic_config.cpp           |  31 +--
 plugins/pausemusic/pausemusic_config.h             |   6 +-
 plugins/pausemusic/pausemusicplugin.cpp            |  23 +-
 plugins/pausemusic/pausemusicplugin.h              |   2 +-
 plugins/ping/CMakeLists.txt                        |  13 +-
 plugins/ping/kdeconnect_ping.desktop               |  64 -----
 plugins/ping/kdeconnect_ping.json                  |  70 +++++
 plugins/ping/pingplugin.cpp                        |  28 +-
 plugins/ping/pingplugin.h                          |   4 +-
 plugins/screensaver-inhibit/CMakeLists.txt         |  12 +-
 .../kdeconnect_screensaver_inhibit.desktop         |  48 ----
 .../kdeconnect_screensaver_inhibit.json            |  52 ++++
 .../screensaverinhibitplugin.cpp                   |  23 +-
 .../screensaver-inhibit/screensaverinhibitplugin.h |   2 +-
 plugins/sftp/CMakeLists.txt                        |  34 +--
 plugins/sftp/kdeconnect_sftp.desktop               |  58 ----
 plugins/sftp/kdeconnect_sftp.json                  |  64 +++++
 plugins/sftp/kdeconnect_sftp_config.desktop        |  30 --
 plugins/sftp/mounter.cpp                           |  79 ++----
 plugins/sftp/mounter.h                             |   6 +-
 plugins/sftp/sftp_config.cpp                       |  95 -------
 plugins/sftp/sftp_config.ui                        | 181 -------------
 .../linkprovider.cpp => plugins/sftp/sftp_debug.h  |  13 +-
 plugins/sftp/sftpplugin.cpp                        |  69 ++---
 plugins/sftp/sftpplugin.h                          |   2 +-
 plugins/share/CMakeLists.txt                       |  29 +-
 plugins/share/autoclosingqfile.h                   |   2 -
 plugins/share/kdeconnect_share.desktop             |  59 ----
 plugins/share/kdeconnect_share.json                |  65 +++++
 plugins/share/share_config.cpp                     |  27 +-
 plugins/share/share_config.h                       |   6 +-
 plugins/share/share_config.ui                      |   4 +-
 .../share/share_debug.h                            |  13 +-
 plugins/share/shareplugin.cpp                      | 114 +++++---
 plugins/share/shareplugin.h                        |   2 +-
 plugins/telephony/CMakeLists.txt                   |  12 +-
 plugins/telephony/kdeconnect_telephony.desktop     |  63 -----
 plugins/telephony/kdeconnect_telephony.json        |  69 +++++
 plugins/telephony/telephonyplugin.cpp              |  52 ++--
 plugins/telephony/telephonyplugin.h                |   8 +-
 tests/CMakeLists.txt                               |  23 +-
 tests/networkpackagetests.cpp                      |  20 +-
 tests/testsocketlinereader.cpp                     |   2 +-
 165 files changed, 3117 insertions(+), 2554 deletions(-)

diff --cc plugins/share/shareplugin.cpp
index 88dcacf,4482376..f2a4f98
--- a/plugins/share/shareplugin.cpp
+++ b/plugins/share/shareplugin.cpp
@@@ -112,10 -148,10 +148,10 @@@ bool SharePlugin::receivePackage(const 
              QDesktopServices::openUrl(QUrl::fromLocalFile(tmpFile.fileName()));
          }
      } else if (np.has("url")) {
 -        QUrl url(np.get<QString>("url"));
 +        QUrl url = QUrl::fromEncoded(np.get<QByteArray>("url"));
          QDesktopServices::openUrl(url);
      } else {
-         kDebug(debugArea()) << "Error: Nothing attached!";
+         qCDebug(KDECONNECT_PLUGIN_SHARE) << "Error: Nothing attached!";
      }
  
      return true;

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list