[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.9-git20110916.28b3101-1-4-g1fa0e4d

[Michael Biebl]

The following commit has been merged in the master branch:
commit 0af77263be707536375b3a179f26dca49ecc4823
Merge: 4f57362c44f61a528df46b9e82a7aaae8dbbecc6 8f6b18ef336c55dc5fb96bf387f4cc1fe974b626
Author: Michael Biebl <biebl at debian.org>
Date:   Thu Oct 6 04:11:04 2011 +0200

    Merge branch 'upstream'

 applet/activatableitem.cpp                         |   15 +-
 applet/activatableitem.h                           |    4 +-
 applet/activatablelistwidget.cpp                   |  102 +++--
 applet/activatablelistwidget.h                     |   12 +-
 applet/gsminterfaceconnectionitem.cpp              |   37 +-
 applet/gsminterfaceconnectionitem.h                |    5 +-
 applet/interfaceconnectionitem.cpp                 |   30 +-
 applet/interfaceconnectionitem.h                   |    3 -
 applet/interfaceitem.cpp                           |   71 ++--
 applet/interfaceitem.h                             |   12 +-
 applet/networkmanager.cpp                          |  395 +++++++++++++-------
 applet/networkmanager.h                            |   39 ++-
 applet/nmpopup.cpp                                 |   68 ++--
 applet/nmpopup.h                                   |    1 +
 applet/vpninterfaceitem.cpp                        |   20 +-
 applet/vpninterfaceitem.h                          |    3 +
 applet/wirelessnetworkitem.cpp                     |   64 ++--
 applet/wirelessnetworkitem.h                       |    8 +-
 backends/NetworkManager/connectiondbus.cpp         |    4 +-
 .../nmdbusactiveconnectionmonitor.cpp              |    8 +-
 backends/NetworkManager/settings/ipv4dbus.cpp      |    6 +-
 dataengine/networkmanagementengine.cpp             |   12 +-
 dataengine/networkmanagementengine.h               |    4 +-
 libs/client/remoteactivatablelist.cpp              |  142 ++------
 libs/client/remoteactivatablelist.h                |    9 +-
 libs/client/remoteinterfaceconnection.cpp          |   19 +-
 libs/client/remoteinterfaceconnection.h            |    9 +-
 libs/internals/activatable.h                       |    2 +-
 libs/internals/connection.cpp                      |    1 +
 libs/internals/interfaceconnection.cpp             |    3 +-
 libs/internals/interfaceconnection.h               |    7 +-
 libs/internals/uiutils.cpp                         |    2 +-
 libs/service/activatablelist.cpp                   |    6 +
 libs/service/activatablelist.h                     |    1 +
 libs/service/connectionusagemonitor.cpp            |    9 +-
 libs/service/connectionusagemonitor.h              |    2 +-
 ...g.kde.networkmanagement.interfaceconnection.xml |    8 +-
 .../interfaces/org.kde.networkmanagement.xml       |    1 +
 .../networkinterfaceactivatableprovider.cpp        |   27 ++
 libs/service/networkinterfaceactivatableprovider.h |    4 +
 libs/service/notificationmanager.cpp               |   15 +-
 libs/service/notificationmanager.h                 |    2 +-
 libs/service/secretstorage.cpp                     |   14 +-
 libs/service/sessionabstractedservice.cpp          |    2 +-
 libs/service/sessionabstractedservice.h            |    2 +-
 libs/service/sortedactivatablelist.cpp             |   34 +-
 libs/service/sortedactivatablelist.h               |    2 +
 .../wirednetworkinterfaceactivatableprovider.cpp   |    7 +-
 ...wirelessnetworkinterfaceactivatableprovider.cpp |    4 +-
 libs/ui/connectionwidget.cpp                       |    6 -
 libs/ui/connectionwidget.h                         |    1 -
 libs/ui/gsmwidget.cpp                              |    4 +-
 libs/ui/pppoewidget.cpp                            |    2 +-
 libs/ui/security/eapmethodleap.cpp                 |    2 +-
 libs/ui/security/eapmethodsimple.cpp               |    2 +-
 libs/ui/security/securityleap.cpp                  |    2 +-
 libs/ui/security/tlswidget.cpp                     |    4 +-
 libs/ui/security/wepwidget.cpp                     |    2 +-
 libs/ui/security/wpapskwidget.cpp                  |    2 +-
 libs/ui/wirelesspreferences.cpp                    |    3 +-
 plasma_nm_version.h                                |    2 +-
 settings/configshell/manageconnection.cpp          |    7 +-
 settings/configshell/manageconnection.h            |    2 +-
 .../libs/solid/control/networkmanager.cpp          |    4 +-
 .../solid/networkmanager-0.9/accesspoint.cpp       |   12 +-
 .../solid/networkmanager-0.9/manager.cpp           |    2 +-
 .../solid/networkmanager-0.9/networkinterface.cpp  |    4 +-
 vpnplugins/openconnect/openconnectauth.cpp         |    5 +-
 vpnplugins/openconnect/openconnectwidget.cpp       |    5 +
 vpnplugins/openvpn/openvpnwidget.cpp               |    1 -
 70 files changed, 765 insertions(+), 566 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging