[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.9-git20111126.1ef1677-1-5-g459072f
Michael Biebl
biebl at alioth.debian.org
Tue Jan 24 07:23:49 UTC 2012
The following commit has been merged in the master branch:
commit 813ebda2c6f9d839a75f4d606410809472ac19d2
Merge: c0b739684f81ca97dc5a94aa5e197761d8ae777b 2077dfe4259f67226bcefe18e04c2b4f8cc48d7f
Author: Michael Biebl <biebl at debian.org>
Date: Tue Jan 24 08:04:31 2012 +0100
Merge branch 'upstream'
CMakeLists.txt | 12 +--
NetworkManager-kde4.conf | 42 --------
applet/activatableitem.cpp | 2 +-
applet/activatablelistwidget.h | 4 +-
applet/networkmanager.cpp | 6 +-
applet/nmpopup.cpp | 10 +-
applet/plasma-applet-networkmanagement.desktop | 7 ++
applet/wirelessinterfaceitem.cpp | 3 +
applet/wirelessstatus.cpp | 9 ++-
backends/NetworkManager/connectiondbus.cpp | 4 +-
.../nmdbussettingsconnectionprovider.cpp | 32 ++----
.../settings/802-11-wireless-securitydbus.cpp | 11 +-
dataengine/plasma-engine-networkmanagement.desktop | 6 +
kded/networkmanagement.desktop | 6 +
libs/client/remoteactivatable.cpp | 57 ++++++++---
libs/client/remoteactivatable.h | 4 +
libs/client/remoteactivatable_p.h | 2 +
libs/internals/activatable.cpp | 12 ++-
libs/internals/activatable.h | 3 +
libs/internals/connection.cpp | 6 +
libs/internals/connection.h | 1 +
libs/internals/interfaceconnectionhelpers.cpp | 2 +
libs/internals/wirelesssecurityidentifier.cpp | 81 ++++++++++------
libs/internals/wirelesssecurityidentifier.h | 2 +-
.../org.kde.networkmanagement.activatable.xml | 3 +
libs/service/networkinterfacemonitor.cpp | 2 +-
libs/service/secretstorage.cpp | 14 +++-
libs/service/secretstorage.h | 2 -
...wirelessnetworkinterfaceactivatableprovider.cpp | 2 +-
libs/ui/networkmanagement_vpnuiplugin.desktop | 7 ++
libs/ui/security/eapmethod.h | 2 +
libs/ui/security/eapmethodleap.cpp | 11 ++
libs/ui/security/eapmethodleap.h | 2 +
libs/ui/security/eapmethodsimple.cpp | 11 ++
libs/ui/security/eapmethodsimple.h | 3 +
libs/ui/security/eapmethodstack.cpp | 26 +++++-
libs/ui/security/eapmethodstack.h | 2 +
libs/ui/security/peapwidget.cpp | 14 +++-
libs/ui/security/peapwidget.h | 2 +
libs/ui/security/securitydynamicwep.cpp | 10 ++
libs/ui/security/securitydynamicwep.h | 2 +
libs/ui/security/tlswidget.cpp | 13 +++-
libs/ui/security/tlswidget.h | 2 +
libs/ui/security/ttlswidget.cpp | 14 +++-
libs/ui/security/ttlswidget.h | 2 +
libs/ui/security/wirelesssecuritysettingwidget.cpp | 22 ++++-
libs/ui/security/wpaeapwidget.cpp | 10 ++
libs/ui/security/wpaeapwidget.h | 2 +
libs/ui/vpnuiplugin.h | 2 +-
monolithic/kde4-knetworkmanager-autostart.desktop | 12 +++
monolithic/knetworkmanager.desktop | 12 +++
networkmanagement.notifyrc | 102 +++++++++++++++++++-
plasma_nm_version.h | 2 +-
qml/package/metadata.desktop | 7 ++
qml/plasma-applet-networkconnections.desktop | 7 ++
settings/config/kcm_networkmanagement.desktop | 7 ++
settings/config/kcm_networkmanagement_tray.desktop | 7 ++
settings/config/manageconnectionwidget.cpp | 6 -
settings/config/mobileconnectionwizard.cpp | 4 +-
settings/config/mobileproviders.cpp | 18 ++++-
settings/configshell/bluetooth.cpp | 19 ++--
settings/configshell/manageconnection.cpp | 7 +-
.../control/backends/fakenet/solid_fakenet.desktop | 8 ++
.../libs/solid/control/networkmanager.cpp | 2 +-
.../solid/control/solidnetworkmanagernm09.desktop | 4 +
.../solid_networkmanager09.desktop | 7 ++
.../networkmanagement_novellvpnui.desktop | 8 ++
vpnplugins/novellvpn/nm-novellvpn-service.h | 7 +-
vpnplugins/novellvpn/novellvpnwidget.cpp | 2 +-
.../networkmanagement_openconnectui.desktop | 6 +
vpnplugins/openconnect/openconnectwidget.cpp | 8 +-
.../openvpn/networkmanagement_openvpnui.desktop | 8 ++
vpnplugins/openvpn/openvpn.cpp | 2 +-
vpnplugins/openvpn/openvpnprop.ui | 4 +-
vpnplugins/openvpn/openvpnwidget.cpp | 16 ++--
vpnplugins/pptp/networkmanagement_pptpui.desktop | 7 ++
.../networkmanagement_strongswanui.desktop | 6 +
vpnplugins/strongswan/strongswanwidget.cpp | 10 +-
vpnplugins/vpnc/networkmanagement_vpncui.desktop | 8 ++
vpnplugins/vpnc/vpncauth.cpp | 4 +-
vpnplugins/vpnc/vpncwidget.cpp | 2 +-
81 files changed, 630 insertions(+), 205 deletions(-)
--
"Network Management" Plasma widget Debian packaging
More information about the pkg-kde-commits
mailing list