[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.9-git20111103.1240c6f-1-4-gc0b7396

[Michael Biebl]

The following commit has been merged in the master branch:
commit ab7343f3436f6730efcc4ddfeb5abf72d06fbbc3
Merge: 40a30fb9b15ea9a77f52d237b53a0a93634bf0fe b356c37d445322c49470914755b602bd65ef5c3a
Author: Michael Biebl <biebl at debian.org>
Date:   Sun Nov 27 17:25:18 2011 +0100

    Merge branch 'upstream'

 applet/activatableitem.cpp                         |   18 ++++-
 applet/activatableitem.h                           |    2 +
 applet/activatablelistwidget.cpp                   |    2 +-
 applet/gsminterfaceconnectionitem.cpp              |   11 ++-
 applet/gsminterfaceconnectionitem.h                |    2 +-
 applet/networkmanager.cpp                          |    5 +-
 applet/plasma-applet-networkmanagement.desktop     |    6 ++
 applet/wirelessnetworkitem.cpp                     |   10 +-
 applet/wirelessnetworkitem.h                       |    2 +-
 applet/wirelessstatus.cpp                          |    9 +--
 backends/NetworkManager/CMakeLists.txt             |    1 +
 backends/NetworkManager/connectiondbus.cpp         |    7 ++-
 .../introspection/nm-connection-secrets.xml        |   43 ---------
 backends/NetworkManager/nmdbussecretagent.cpp      |   10 ++-
 backends/NetworkManager/nmdbussecretagent.h        |    2 +-
 .../nmdbussettingsconnectionprovider.cpp           |   38 ++++++++-
 .../nmdbussettingsconnectionprovider.h             |    1 +
 dataengine/plasma-engine-networkmanagement.desktop |    6 ++
 kded/networkmanagement.desktop                     |    4 +
 kded/nm08connections.cpp                           |    2 +-
 libs/client/remoteactivatable.cpp                  |   13 ++-
 libs/client/remotewirelessinterfaceconnection.cpp  |    5 -
 libs/client/remotewirelessinterfaceconnection.h    |    1 -
 libs/client/remotewirelessnetwork.cpp              |    6 --
 libs/client/remotewirelessnetwork.h                |    1 -
 libs/client/remotewirelessobject.h                 |    1 -
 libs/internals/connection.cpp                      |   32 ++++---
 libs/internals/connection.h                        |   10 ++-
 libs/internals/uiutils.cpp                         |    2 +-
 libs/service/notificationmanager.cpp               |    4 +
 libs/service/notificationmanager.h                 |    1 +
 libs/service/secretsprovider.h                     |    2 +-
 libs/service/secretstorage.cpp                     |   19 ++--
 libs/ui/advancedpermissionswidget.ui               |    3 -
 libs/ui/bluetoothconnectioneditor.cpp              |    9 ++-
 libs/ui/gsmwidget.cpp                              |    1 +
 libs/ui/networkmanagement_vpnuiplugin.desktop      |    4 +
 libs/ui/security/eapmethodstack.cpp                |   12 ++-
 libs/ui/security/eapmethodstack.h                  |    2 +
 monolithic/kde4-knetworkmanager-autostart.desktop  |    9 ++
 monolithic/knetworkmanager.desktop                 |    9 ++
 networkmanagement.notifyrc                         |   61 +++++++++++++
 plasma_nm_version.h                                |    2 +-
 qml/package/metadata.desktop                       |    6 ++
 qml/plasma-applet-networkconnections.desktop       |    6 ++
 settings/config/kcm_networkmanagement.desktop      |    6 ++
 settings/config/kcm_networkmanagement_tray.desktop |    5 +
 settings/config/manageconnectionwidget.cpp         |   12 ++-
 settings/configshell/manageconnection.cpp          |   17 +++--
 .../control/backends/fakenet/solid_fakenet.desktop |    6 ++
 .../solid/control/solidnetworkmanagernm09.desktop  |    4 +
 .../solid_networkmanager09.desktop                 |    7 ++
 .../networkmanagement_novellvpnui.desktop          |    5 +
 vpnplugins/novellvpn/novellvpnprop.ui              |    2 +-
 vpnplugins/openconnect/CMakeLists.txt              |   39 +++++----
 .../networkmanagement_openconnectui.desktop        |    8 ++
 .../openvpn/networkmanagement_openvpnui.desktop    |    6 ++
 vpnplugins/openvpn/openvpnprop.ui                  |    2 +-
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |    6 ++
 .../networkmanagement_strongswanui.desktop         |    6 ++
 vpnplugins/strongswan/strongswanauth.cpp           |    7 ++
 vpnplugins/strongswan/strongswanauth.h             |    1 +
 vpnplugins/strongswan/strongswanauth.ui            |   20 +----
 vpnplugins/strongswan/strongswanprop.ui            |    4 +-
 vpnplugins/strongswan/strongswanwidget.cpp         |    8 ++
 vpnplugins/strongswan/strongswanwidget.h           |    1 +
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |    6 ++
 vpnplugins/vpnc/vpncauth.cpp                       |   33 ++++++-
 vpnplugins/vpnc/vpncauth.h                         |    1 +
 vpnplugins/vpnc/vpncauth.ui                        |   92 ++++++++++---------
 vpnplugins/vpnc/vpncprop.ui                        |    4 +-
 vpnplugins/vpnc/vpncwidget.cpp                     |   21 +++++
 vpnplugins/vpnc/vpncwidget.h                       |    1 +
 73 files changed, 507 insertions(+), 225 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging