[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1+git20110422.810bc16-1-9-g91689b3

Michael Biebl biebl at alioth.debian.org
Fri May 27 11:52:16 UTC 2011


The following commit has been merged in the master branch:
commit aa09f3ad958e2726427e984a691f482f24ac332e
Merge: 8b6a4e8540058e537276b0ede9fd9e38f459efe7 ea10c790220feca3adba0a9d23920889f74c3771
Author: Michael Biebl <biebl at debian.org>
Date:   Fri May 27 10:38:13 2011 +0200

    Merge commit 'upstream/0.1+git20110526.911025d'

 CMakeLists.txt                                     |  110 ++++----
 applet/CMakeLists.txt                              |    2 +
 applet/activatableitem.cpp                         |   22 ++-
 applet/activatablelistwidget.cpp                   |   57 +++--
 applet/activatablelistwidget.h                     |    2 +-
 applet/gsminterfaceconnectionitem.cpp              |   57 ++--
 applet/gsminterfaceconnectionitem.h                |    4 +-
 applet/interfaceconnectionitem.cpp                 |    3 -
 applet/interfacedetailswidget.cpp                  |  237 ++++++++--------
 applet/interfacedetailswidget.h                    |    7 +-
 applet/interfaceitem.cpp                           |   56 +++--
 applet/interfaceitem.h                             |    2 +-
 applet/networkmanager.cpp                          |    9 +-
 applet/networkmanager.h                            |    1 -
 applet/nmpopup.cpp                                 |  157 +++++++---
 applet/nmpopup.h                                   |   10 +-
 applet/plasma-applet-networkmanagement.desktop     |    3 +
 applet/vpninterfaceitem.cpp                        |    2 +-
 applet/wirelessinterfaceitem.cpp                   |    2 +-
 applet/wirelessinterfaceitem.h                     |    1 -
 applet/wirelessnetworkitem.cpp                     |   22 +-
 applet/wirelessstatus.cpp                          |    2 +-
 backends/NetworkManager/CMakeLists.txt             |    7 +-
 backends/NetworkManager/connectiondbus.cpp         |   35 +++-
 backends/NetworkManager/exportedconnection.h       |    2 -
 .../NetworkManager/exportedconnectionsecrets.h     |    1 -
 .../NetworkManager/nmdbusactiveconnectionmonitor.h |    1 -
 .../nmdbussettingsconnectionprovider.cpp           |  130 ++++++++-
 .../nmdbussettingsconnectionprovider.h             |    8 +-
 backends/NetworkManager/nmdbussettingsservice.cpp  |   21 ++
 backends/NetworkManager/nmdbussettingsservice.h    |    1 -
 backends/NetworkManager/remoteconnection.cpp       |    5 +
 .../settings/802-11-wireless-securitydbus.cpp      |   59 ++--
 backends/NetworkManager/settings/bluetoothdbus.cpp |   43 +++
 backends/NetworkManager/settings/bluetoothdbus.h   |   26 ++
 backends/NetworkManager/settings/ipv4dbus.cpp      |   72 ++++-
 backends/NetworkManager/settings/ipv6dbus.cpp      |  305 ++++++++++++++++++++
 backends/NetworkManager/settings/ipv6dbus.h        |   60 ++++
 dataengine/networkmanagementengine.cpp             |    1 +
 dataengine/networkmanagementengine.h               |    7 -
 dataengine/plasma-engine-networkmanagement.desktop |   16 +
 kded/service.cpp                                   |    8 +-
 libs/client/CMakeLists.txt                         |    2 +-
 libs/client/remoteactivatablelist.cpp              |   76 +++++-
 libs/client/remoteactivatablelist.h                |    9 +
 libs/client/remotegsminterfaceconnection.cpp       |   15 +-
 libs/client/remotegsminterfaceconnection.h         |   10 +-
 libs/internals/CMakeLists.txt                      |   10 +
 libs/internals/activatable.h                       |    2 +
 libs/internals/connection.cpp                      |   69 +++++
 libs/internals/connection.h                        |   19 +-
 libs/internals/connectionpersistence.cpp           |   38 ++-
 libs/internals/connectionpersistence.h             |    4 +
 libs/internals/gsminterfaceconnection.cpp          |   42 +++-
 libs/internals/gsminterfaceconnection.h            |    9 +-
 libs/internals/gsminterfaceconnectionhelpers.cpp   |    2 +-
 libs/internals/kconfig_compiler.cpp                |   12 +-
 .../schemas/{pppoe.kcfg => bluetooth.kcfg}         |   16 +-
 .../schemas/{cdma.kcfgc => bluetooth.kcfgc}        |    4 +-
 libs/internals/schemas/ipv4.kcfg                   |    4 +
 libs/internals/schemas/{ipv4.kcfg => ipv6.kcfg}    |   21 +-
 libs/internals/schemas/{cdma.kcfgc => ipv6.kcfgc}  |    4 +-
 libs/internals/setting.cpp                         |   24 ++-
 libs/internals/setting.h                           |    7 +-
 .../802-11-wireless-securitypersistence.cpp        |   35 ++--
 libs/internals/settings/802-1x.cpp                 |  104 +++++++-
 libs/internals/settings/802-1x.h                   |  199 ++++++++++++-
 libs/internals/settings/802-1xpersistence.cpp      |   24 +-
 libs/internals/settings/bluetooth.cpp              |   23 ++
 libs/internals/settings/bluetooth.h                |  115 ++++++++
 libs/internals/settings/bluetoothpersistence.cpp   |   45 +++
 .../{gsmpersistence.h => bluetoothpersistence.h}   |   12 +-
 libs/internals/settings/gsmpersistence.cpp         |    6 +-
 libs/internals/settings/ipv4.cpp                   |    3 +-
 libs/internals/settings/ipv4.h                     |   22 ++-
 libs/internals/settings/ipv4persistence.cpp        |    9 +-
 libs/internals/settings/ipv6.cpp                   |   28 ++
 libs/internals/settings/{ipv4.h => ipv6.h}         |   68 ++---
 .../{ipv4persistence.cpp => ipv6persistence.cpp}   |   68 +++---
 .../{cdmapersistence.h => ipv6persistence.h}       |   14 +-
 libs/internals/uiutils.cpp                         |   26 +--
 libs/internals/uiutils.h                           |    7 -
 libs/service/CMakeLists.txt                        |    7 +
 libs/service/configurationlauncher.cpp             |    5 +
 libs/service/connectionlistpersistence.cpp         |    1 +
 libs/service/connectionlistpersistencedbus.cpp     |    1 +
 .../gsmnetworkinterfaceactivatableprovider.cpp     |    4 +-
 ...de.networkmanagement.gsminterfaceconnection.xml |    6 +-
 .../networkinterfaceactivatableprovider.cpp        |    3 +
 libs/service/networkinterfacemonitor.cpp           |  124 +++++++--
 libs/service/networkinterfacemonitor.h             |   11 +
 libs/service/notificationmanager.cpp               |   97 +++++--
 libs/service/notificationmanager.h                 |    8 +-
 libs/service/pindialog.cpp                         |  205 +++++++++++++
 libs/service/pindialog.h                           |   69 +++++
 libs/service/pinwidget.ui                          |  210 ++++++++++++++
 libs/service/sessionabstractedservice.cpp          |    1 +
 libs/ui/802-11-wireless.ui                         |   15 +-
 libs/ui/802_11_wirelesswidget.cpp                  |   44 +++-
 libs/ui/802_11_wirelesswidget.h                    |    1 +
 libs/ui/CMakeLists.txt                             |   19 ++-
 libs/ui/apitemview.cpp                             |    7 +-
 libs/ui/apitemview.h                               |    4 +
 libs/ui/{pppoe.ui => bluetooth.ui}                 |   85 +++---
 libs/ui/bluetoothconnectioneditor.cpp              |  143 +++++++++
 ...nectioneditor.h => bluetoothconnectioneditor.h} |   14 +-
 libs/ui/bluetoothwidget.cpp                        |   86 ++++++
 libs/ui/{gsmwidget.h => bluetoothwidget.h}         |   25 +-
 libs/ui/connectioneditor.cpp                       |   13 +-
 libs/ui/connectionsecretsjob.cpp                   |    6 +-
 libs/ui/delegate.cpp                               |   60 ++++
 .../othersettingswidget.h => libs/ui/delegate.h    |   36 ++--
 libs/ui/editlistdialog.cpp                         |   20 +-
 libs/ui/gsmconnectioneditor.cpp                    |   35 +--
 libs/ui/{editlistdialog.h => intdelegate.cpp}      |   45 +--
 .../othersettingswidget.h => libs/ui/intdelegate.h |   36 ++--
 libs/ui/intvalidator.cpp                           |   67 +++++
 .../ui/{security/securityleap.h => intvalidator.h} |   33 +--
 libs/ui/ipv4.ui                                    |   66 +++--
 libs/ui/ipv4advanced.ui                            |   10 +-
 libs/ui/ipv4advancedwidget.cpp                     |   39 +---
 libs/ui/ipv4advancedwidget.h                       |   19 +--
 libs/ui/{apitemdelegate.h => ipv4delegate.cpp}     |   32 +--
 vpnplugins/pptp/pptp.h => libs/ui/ipv4delegate.h   |   28 +-
 libs/ui/{ipv4advanced.ui => ipv4routes.ui}         |   48 +++-
 ...ipv4advancedwidget.cpp => ipv4routeswidget.cpp} |  136 ++++-----
 .../{ipv4advancedwidget.h => ipv4routeswidget.h}   |   43 +--
 libs/ui/ipv4widget.cpp                             |   32 ++-
 libs/ui/{ipv4.ui => ipv6.ui}                       |   91 +++---
 libs/ui/{ipv4advanced.ui => ipv6advanced.ui}       |   14 +-
 ...v4advancedwidget.cpp => ipv6advancedwidget.cpp} |  106 +++-----
 .../{ipv4advancedwidget.h => ipv6advancedwidget.h} |   40 +--
 .../novellvpn.h => libs/ui/ipv6delegate.cpp        |   33 +--
 vpnplugins/pptp/pptp.h => libs/ui/ipv6delegate.h   |   28 +-
 libs/ui/{ipv4advanced.ui => ipv6routes.ui}         |   48 +++-
 ...ipv4advancedwidget.cpp => ipv6routeswidget.cpp} |  155 +++++------
 .../{ipv4advancedwidget.h => ipv6routeswidget.h}   |   45 +--
 libs/ui/{ipv4widget.cpp => ipv6widget.cpp}         |  244 ++++++++--------
 libs/ui/{ipv4widget.h => ipv6widget.h}             |   18 +-
 libs/ui/pppoepreferences.cpp                       |    3 +
 libs/ui/scanwidget.cpp                             |   52 +++-
 libs/ui/scanwidget.h                               |    9 +-
 libs/ui/scanwidget.ui                              |   34 +++-
 libs/ui/security/eapmethodleap.cpp                 |    1 +
 libs/ui/security/eapmethodpeapbase.ui              |   98 +++++--
 libs/ui/security/eapmethodtlsbase.ui               |  156 +++++++++--
 libs/ui/security/eapmethodttlsbase.ui              |   66 ++++-
 libs/ui/security/peapwidget.cpp                    |   57 +++-
 libs/ui/security/peapwidget.h                      |    8 +-
 libs/ui/security/tlswidget.cpp                     |  187 +++++++++----
 libs/ui/security/tlswidget.h                       |    7 +-
 libs/ui/security/ttlswidget.cpp                    |   56 +++-
 libs/ui/security/ttlswidget.h                      |    6 +-
 libs/ui/security/wepwidget.cpp                     |   21 +-
 libs/ui/security/wirelesssecuritysettingwidget.cpp |    2 +-
 ...alidator.cpp => simpleipv6addressvalidator.cpp} |   70 ++---
 ...essvalidator.h => simpleipv6addressvalidator.h} |   16 +-
 libs/ui/vpnpreferences.cpp                         |    5 +
 libs/ui/wiredpreferences.cpp                       |    3 +
 libs/ui/wirelesspreferences.cpp                    |    5 +
 monolithic/kde4-knetworkmanager-autostart.desktop  |    1 +
 monolithic/knetworkmanager.desktop                 |    1 +
 monolithic/knetworkmanagertrayicon.cpp             |    1 +
 networkmanagement.notifyrc                         |    7 +
 qml/package/contents/code/main.qml                 |  139 +++++-----
 qml/package/metadata.desktop                       |    8 +
 qml/plasma-applet-networkconnections.desktop       |    8 +
 settings/config/CMakeLists.txt                     |    4 +-
 settings/config/kcm_networkmanagement.desktop      |    1 +
 settings/config/kcm_networkmanagement_tray.desktop |    1 +
 settings/config/manageconnectionwidget.cpp         |  245 +++++++++++------
 settings/config/manageconnectionwidget.h           |    7 +-
 settings/config/mobileconnectionwizard.cpp         |   97 ++++---
 settings/config/mobileconnectionwizard.h           |   11 +-
 settings/config/othersettings.ui                   |   16 +-
 settings/config/othersettingswidget.cpp            |    9 +
 settings/config/othersettingswidget.h              |    2 +
 settings/configshell/CMakeLists.txt                |    5 +
 settings/configshell/bluetooth.cpp                 |  273 ++++++++++++++++++
 .../configshell/bluetooth.h                        |   52 ++--
 settings/configshell/main.cpp                      |   55 ++--
 solidcontrolfuture/CMakeLists.txt                  |    1 +
 solidcontrolfuture/networkipv6config.cpp           |  228 +++++++++++++++
 solidcontrolfuture/networkipv6config.h             |   97 +++++++
 .../openvpn/networkmanagement_openvpnui.desktop    |    1 +
 vpnplugins/pptp/pptpwidget.cpp                     |    2 +-
 vpnplugins/strongswan/strongswanwidget.cpp         |    2 +-
 vpnplugins/vpnc/vpncauth.cpp                       |    2 +-
 vpnplugins/vpnc/vpncwidget.cpp                     |    2 +-
 189 files changed, 5745 insertions(+), 1999 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list