[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=6b94e7f

The following commit has been merged in the master branch:
commit 6b94e7faf87ac6a1d9e2cde28056d406734bed6e
Merge: a64d6cd21553c1b0d1c094ea4ec0b888f02fdc41 a389ce41fba3c2b6f7fa54e4e1f2c3f9f00dcd18
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Fri Feb 14 13:07:52 2014 +0100

    Merge branch 'qmlsftp'
    
    Conflicts:
    	kded/daemon.cpp

 CMakeLists.txt                                     |   2 +-
 kcm/kcm.cpp                                        |   7 +
 kcm/kcm.h                                          |   1 +
 kcm/kcm.ui                                         |   7 +
 kded/CMakeLists.txt                                |  25 ++-
 kded/daemon.cpp                                    |  57 +++--
 kded/daemon.h                                      |   9 +-
 kded/device.cpp                                    |  42 ++--
 kded/device.h                                      |   8 +-
 kded/kdeconnectd.cpp                               |  89 ++++++++
 kded/kded.cpp                                      | 120 ++++++++++
 kded/{plugins/share/shareplugin.h => kded.h}       |  38 ++--
 kded/networkpackage.h                              |   1 +
 kded/plugins/CMakeLists.txt                        |   1 +
 kded/plugins/battery/batterydbusinterface.cpp      |   3 +-
 kded/plugins/battery/batterydbusinterface.h        |   9 +-
 kded/plugins/clipboard/clipboardplugin.cpp         |   1 -
 kded/plugins/kdeconnectplugin.cpp                  |   5 +
 kded/plugins/kdeconnectplugin.h                    |   1 +
 kded/plugins/pausemusic/pausemusic_config.cpp      |   7 +-
 kded/plugins/pausemusic/pausemusic_config.ui       |  24 +-
 kded/plugins/pausemusic/pausemusicplugin.cpp       |  68 ++++--
 kded/plugins/sftp/CMakeLists.txt                   |  64 ++++++
 kded/plugins/sftp/README                           |  16 ++
 kded/plugins/sftp/kdeconnect_sftp.desktop          |  17 ++
 kded/plugins/sftp/kdeconnect_sftp_config.desktop   |  12 +
 kded/plugins/sftp/mounter.cpp                      | 249 +++++++++++++++++++++
 kded/plugins/sftp/mounter.h                        |  75 +++++++
 .../{kdeconnectplugin.cpp => sftp/mountloop.cpp}   |  30 ++-
 .../{ping/pingplugin.h => sftp/mountloop.h}        |  30 +--
 kded/plugins/sftp/sftp_config.cpp                  | 102 +++++++++
 .../pausemusic_config.h => sftp/sftp_config.h}     |  26 ++-
 kded/plugins/sftp/sftp_config.ui                   | 224 ++++++++++++++++++
 kded/plugins/sftp/sftpplugin.cpp                   | 213 ++++++++++++++++++
 kded/plugins/sftp/sftpplugin.h                     |  83 +++++++
 kio/CMakeLists.txt                                 |  20 ++
 kio/Messages.sh                                    |   4 +
 {kcm => kio}/kdebugnamespace.cpp                   |   4 +-
 {kcm => kio}/kdebugnamespace.h                     |   2 +-
 kio/kdeconnect.protocol                            |  16 ++
 kio/kiokdeconnect.cpp                              | 240 ++++++++++++++++++++
 kded/backends/devicelink.h => kio/kiokdeconnect.h  |  47 ++--
 libkdeconnect/CMakeLists.txt                       |   3 +
 libkdeconnect/dbusinterfaces.cpp                   |  29 ++-
 libkdeconnect/dbusinterfaces.h                     |  10 +
 plasmoid/declarativeplugin/CMakeLists.txt          |   9 +-
 plasmoid/declarativeplugin/batteryinterface.cpp    |  73 ------
 plasmoid/declarativeplugin/batteryinterface.h      |  65 ------
 .../kdeconnectdeclarativeplugin.cpp                |  54 ++++-
 .../kdeconnectdeclarativeplugin.h                  |   5 +-
 plasmoid/declarativeplugin/objectfactory.h         |  46 ++++
 plasmoid/declarativeplugin/responsewaiter.cpp      | 132 +++++++++++
 plasmoid/declarativeplugin/responsewaiter.h        |  63 ++++++
 plasmoid/package/contents/ui/Battery.qml           |  81 +++++++
 plasmoid/package/contents/ui/DeviceDelegate.qml    |  75 ++++++-
 plasmoid/package/contents/ui/Sftp.qml              |  62 +++++
 56 files changed, 2393 insertions(+), 313 deletions(-)

diff --cc kded/plugins/pausemusic/pausemusicplugin.cpp
index 9e270af,04f7a72..8c39d55
--- a/kded/plugins/pausemusic/pausemusicplugin.cpp
+++ b/kded/plugins/pausemusic/pausemusicplugin.cpp
@@@ -32,8 -32,22 +32,22 @@@
  #include "../../kdebugnamespace.h"
  
  K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< PauseMusicPlugin >(); )
 -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_pausemusic", "kdeconnect_pausemusic") )
 +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_pausemusic", "kdeconnect-kded") )
  
+ //TODO: Port this away from KMix to use only Pulseaudio
+ bool isKMixMuted() {
+     QDBusInterface kmixInterface("org.kde.kmix", "/Mixers", "org.kde.KMix.MixSet");
+     QString mixer = kmixInterface.property("currentMasterMixer").toString();
+     QString control = kmixInterface.property("currentMasterControl").toString();
+     mixer.replace(':','_');
+     control.replace(':','_');
+ 
+     QDBusInterface mixerInterface("org.kde.kmix", "/Mixers/"+mixer+"/"+control, "org.kde.KMix.Control");
+     if (mixerInterface.property("mute").toBool()) return true;
+     return (mixerInterface.property("volume").toInt() == 0);
+ }
+ 
+ 
  PauseMusicPlugin::PauseMusicPlugin(QObject* parent, const QVariantList& args)
      : KdeConnectPlugin(parent, args)
  {

-- 
kdeconnect packaging