[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. master/0.1-svn970021-2-37-g3aab2bd

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 2b162e196529593216344a99329c28ce73ebac0a
Merge: e546ed0b126826655a5b6ec52d5a89fa54ee1c66 2436b342a6aa0729a8fa52ce6775fe622f04b1f6
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Aug 6 21:59:15 2009 +0300

    Merge branch 'upstream'

 applet/CMakeLists.txt                              |    7 +-
 applet/activatablelistwidget.cpp                   |   41 +-
 applet/interfaceconnectionitem.cpp                 |    1 +
 applet/interfaceitem.cpp                           |   62 +--
 applet/networkmanager.cpp                          |   97 +--
 applet/networkmanager.h                            |   11 +-
 applet/nmextenderitem.cpp                          |  105 +++-
 applet/nmextenderitem.h                            |   15 +-
 applet/plasma-applet-networkmanagement.desktop     |    2 +
 applet/wirelessinterfaceitem.cpp                   |  112 +---
 applet/wirelessinterfaceitem.h                     |   11 +-
 applet/wirelessnetworkitem.cpp                     |   68 ++-
 applet/wirelessnetworkitem.h                       |    2 +
 .../settings/802-11-wireless-securitydbus.cpp      |    4 +-
 backends/NetworkManager/settings/802-1xdbus.cpp    |  315 +++++----
 kded/networkmanagement.desktop                     |    3 +
 libs/client/remoteactivatablelist.cpp              |   14 +-
 libs/client/remotevpninterfaceconnection.cpp       |    6 -
 libs/client/remotevpninterfaceconnection.h         |    2 -
 libs/client/remotewirelessinterfaceconnection.h    |    2 +-
 libs/internals/knmserviceprefs.kcfg                |    2 +-
 libs/internals/schemas/802-1x.kcfg                 |   37 +-
 libs/internals/settings/802-1x.cpp                 |    2 +-
 libs/internals/settings/802-1x.h                   |   75 ++-
 libs/internals/settings/802-1xpersistence.cpp      |  111 +++-
 libs/internals/settings_hand_edits.diff            |  703 +++++++++++++-------
 libs/service/sessionabstractedservice.cpp          |    6 +-
 libs/ui/CMakeLists.txt                             |   58 ++-
 libs/ui/connectionsecretsjob.cpp                   |    6 +-
 libs/ui/networkmanagement_vpnuiplugin.desktop      |    2 +
 .../security/802_11_wireless_security_widget.cpp   |  239 -------
 .../security/eapmethod.cpp}                        |   26 +-
 .../security/eapmethod.h}                          |   38 +-
 .../security/eapmethod_p.h}                        |   24 +-
 .../security/eapmethodinnerauth.cpp}               |   23 +-
 .../security/eapmethodinnerauth.h}                 |   25 +-
 .../security/eapmethodinnerauth_p.h}               |   23 +-
 libs/ui/security/eapmethodleap.cpp                 |   79 +++
 .../security/eapmethodleap.h}                      |   30 +-
 libs/ui/security/{leap.ui => eapmethodleapbase.ui} |   23 +-
 .../{security_eap.ui => eapmethodpeapbase.ui}      |   87 ++--
 libs/ui/security/eapmethodsimple.cpp               |   83 +++
 .../ui/security/eapmethodsimple.h                  |   44 +-
 libs/ui/security/eapmethodsimple.ui                |   60 ++
 libs/ui/security/eapmethodsimplebase.ui            |   60 ++
 libs/ui/security/eapmethodstack.cpp                |  120 ++++
 libs/ui/security/eapmethodstack.h                  |   61 ++
 .../security/eapmethodstack_p.h}                   |   25 +-
 ..._wireless_security.ui => eapmethodstackbase.ui} |   23 +-
 .../{security_tls.ui => eapmethodtlsbase.ui}       |   50 +-
 libs/ui/security/{leap.ui => eapmethodttlsbase.ui} |   48 +-
 libs/ui/security/eapwidget.cpp                     |   33 -
 libs/ui/security/eapwidget.h                       |   51 --
 .../security/nullsecuritywidget.cpp}               |   27 +-
 .../security/nullsecuritywidget.h}                 |   25 +-
 libs/ui/security/peapwidget.cpp                    |  122 ++---
 libs/ui/security/peapwidget.h                      |   15 +-
 libs/ui/security/security_peap.ui                  |  196 ------
 libs/ui/security/security_ttls.ui                  |  160 -----
 libs/ui/security/securitywidget.cpp                |   12 +-
 libs/ui/security/securitywidget.h                  |    6 +-
 .../security/securitywidget_p.h}                   |   18 +-
 libs/ui/security/tlswidget.cpp                     |   33 +-
 libs/ui/security/tlswidget.h                       |   15 +-
 libs/ui/security/ttlswidget.cpp                    |  112 ++--
 libs/ui/security/ttlswidget.h                      |   21 +-
 libs/ui/security/wepwidget.cpp                     |    4 +-
 ...11_wireless_security.ui => wirelesssecurity.ui} |   13 +-
 libs/ui/security/wirelesssecuritysettingwidget.cpp |  215 ++++++
 ...ty_widget.h => wirelesssecuritysettingwidget.h} |   21 +-
 libs/ui/security/wpaeap.ui                         |   60 --
 libs/ui/security/wpaeapwidget.cpp                  |  138 ++--
 libs/ui/security/wpaeapwidget.h                    |   17 +-
 libs/ui/security/wpapskwidget.cpp                  |    2 +-
 libs/ui/wirelesspreferences.cpp                    |    4 +-
 monolithic/kde4-knetworkmanager-autostart.desktop  |    5 +
 monolithic/knetworkmanager.desktop                 |    5 +
 monolithic/wirelessnetworkitem.cpp                 |    2 +-
 monolithic/wirelessnetworkitem.h                   |    2 +-
 monolithic/wirelessstatus.cpp                      |  120 ++--
 monolithic/wirelessstatus.h                        |    6 +-
 networkmanagement.notifyrc                         |   33 +-
 settings/config/kcm_networkmanagement.desktop      |    2 +
 settings/config/menutooltipsettingswidget.ui       |    3 -
 settings/service/knetworkmanager.desktop           |    2 +
 vpnplugins/openvpn/nm-openvpn-service.h            |   15 +-
 vpnplugins/openvpn/openvpn.cpp                     |    4 +-
 vpnplugins/openvpn/openvpnprop.ui                  |  304 ++++++---
 vpnplugins/openvpn/openvpnwidget.cpp               |  207 +++++-
 vpnplugins/openvpn/openvpnwidget.h                 |    7 +
 vpnplugins/vpnc/CMakeLists.txt                     |    2 +-
 vpnplugins/vpnc/nm-vpnc-service.h                  |   54 ++
 vpnplugins/vpnc/vpnc.cpp                           |    2 +-
 vpnplugins/vpnc/vpncprop.ui                        |  472 ++++++++------
 vpnplugins/vpnc/vpncwidget.cpp                     |  197 ++++++-
 vpnplugins/vpnc/vpncwidget.h                       |   11 +-
 96 files changed, 3443 insertions(+), 2405 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging