[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=0c95010

The following commit has been merged in the master branch:
commit 0c95010c3bc704ea1401469507a97277eb98006f
Merge: 29d3f9aa7a51c858505cd45251f182f768342d2b 174cf3d3ce3d10fdaf7ce1379a889a51bc47b2d6
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Apr 14 19:00:42 2016 -0700

    Merge branch 'master' into sslrefactor
    
    # Conflicts:
    #	core/device.cpp
    #	interfaces/devicesmodel.cpp

 app/org.kde.kdeconnect.app.desktop                 |   6 +
 daemon/kdeconnect.desktop                          |   4 +
 daemon/kdeconnectd.desktop.cmake                   |   2 +
 fileitemactionplugin/kdeconnectsendfile.desktop    |   5 +
 interfaces/dbusinterfaces.cpp                      |   1 +
 interfaces/dbusinterfaces.h                        |   4 +
 interfaces/devicesmodel.cpp                        |  41 +++--
 interfaces/devicesmodel.h                          |   8 +-
 interfaces/notificationsmodel.cpp                  |  23 ++-
 interfaces/notificationsmodel.h                    |   3 +-
 kcm/kcm_kdeconnect.desktop                         |   6 +
 kcm/org.kde.kdeconnect.kcm.desktop                 |   4 +
 kdeconnect.appdata.xml                             |   4 +
 org.kde.kdeconnect.nonplasma.desktop               |   4 +
 plasmoid/package/contents/ui/Battery.qml           |  27 +--
 plasmoid/package/contents/ui/FindMyPhone.qml       |  23 +--
 .../contents/ui/{Sftp.qml => PluginChecker.qml}    |  33 +---
 plasmoid/package/contents/ui/Sftp.qml              |  23 +--
 plasmoid/package/metadata.desktop                  |   8 +-
 plugins/battery/batterydbusinterface.cpp           |   2 +-
 plugins/clipboard/kdeconnect_clipboard.json        |   2 +-
 plugins/findmyphone/kdeconnect_findmyphone.json    |   2 +
 plugins/kdeconnect.notifyrc                        |  56 ++++--
 plugins/kdeconnect_plugin.desktop                  |   2 +
 plugins/lockdevice/kdeconnect_lockdevice.json      |   1 +
 plugins/mpriscontrol/kdeconnect_mpriscontrol.json  |   1 +
 plugins/mpriscontrol/mpriscontrolplugin.cpp        |  26 +--
 plugins/mpriscontrol/mpriscontrolplugin.h          |   4 +-
 plugins/notifications/CMakeLists.txt               |   3 +-
 .../kdeconnect_notifications_config.desktop        |   9 +-
 plugins/notifications/notifications_config.cpp     |   6 +
 plugins/notifications/notifications_config.ui      |  16 ++
 .../notifications/notificationsdbusinterface.cpp   |   2 +
 plugins/notifications/notificationsdbusinterface.h |   1 +
 plugins/notifications/notificationslistener.cpp    |  27 ++-
 plugins/pausemusic/kdeconnect_pausemusic.json      |   2 +-
 .../kdeconnect_pausemusic_config.desktop           |   2 +
 .../remotecontrol/kdeconnect_remotecontrol.json    |   1 +
 plugins/runcommand/kdeconnect_runcommand.json      |   1 +
 .../kdeconnect_runcommand_config.desktop           |   2 +
 .../kdeconnect_screensaver_inhibit.json            |   2 +-
 plugins/share/kdeconnect_share_config.desktop      |   2 +
 plugins/telephony/telephonyplugin.cpp              |   9 +-
 tests/CMakeLists.txt                               |   4 +-
 tests/testnotificationlistener.cpp                 | 199 +++++++++++++++++----
 45 files changed, 436 insertions(+), 177 deletions(-)

diff --cc interfaces/devicesmodel.cpp
index 83e7b58,0bf7815..059e07b
--- a/interfaces/devicesmodel.cpp
+++ b/interfaces/devicesmodel.cpp
@@@ -262,10 -267,10 +267,12 @@@ QVariant DevicesModel::data(const QMode
          }
          case StatusModelRole: {
              int status = StatusFilterFlag::NoFilter;
 -            if (device->isReachable())
 +            if (device->isReachable()) {
                  status |= StatusFilterFlag::Reachable;
-                 if (device->isTrusted()) status |= StatusFilterFlag::Paired;
 -            if (device->isPaired())
++            }
++            if (device->isTrusted()) {
+                 status |= StatusFilterFlag::Paired;
 +            }
              return status;
          }
          case IconNameRole:
@@@ -295,3 -300,11 +302,11 @@@ int DevicesModel::rowCount(const QModel
  
      return m_deviceList.size();
  }
+ 
+ bool DevicesModel::passesFilter(DeviceDbusInterface* dev) const
+ {
+     bool onlyPaired = (m_displayFilter & StatusFilterFlag::Paired);
+     bool onlyReachable = (m_displayFilter & StatusFilterFlag::Reachable);
+ 
 -    return !((onlyReachable && !dev->isReachable()) || (onlyPaired && !dev->isPaired()));
++    return !((onlyReachable && !dev->isReachable()) || (onlyPaired && !dev->isTrusted()));
+ }

-- 
kdeconnect packaging