[SCM] "Network Management" Plasma widget Debian packaging branch, upstream, updated. upstream/0.1+git20110727.96f5505-1-g260db2b

Michael Biebl biebl at alioth.debian.org
Fri Sep 2 22:04:06 UTC 2011


The following commit has been merged in the upstream branch:
commit 260db2b22d036e3fe7b51058c08da791a72c4644
Author: Michael Biebl <biebl at debian.org>
Date:   Fri Sep 2 18:59:38 2011 +0200

    Upstream Git snapshot 2144cb1 (nm09 branch)
    
    commit 2144cb1b554d6b3e9b9e7fb54bcf579d2336524d
    Author: Lamarque V. Souza <lamarque at gmail.com>
    Date:   Thu Sep 1 14:31:26 2011 -0300
    
        Also sort connections by name (or ssid if applicable).
    
        CCBUG: 275502
---
 CMakeLists.txt                                     |   53 +-
 NetworkManager-kde4.conf                           |   10 +-
 applet/CMakeLists.txt                              |   14 +-
 applet/activatableitem.cpp                         |    7 +-
 applet/activatableitem.h                           |    2 +-
 applet/activatablelistwidget.cpp                   |   51 +-
 applet/activatablelistwidget.h                     |    6 +-
 applet/gsminterfaceconnectionitem.cpp              |    7 +-
 applet/gsminterfaceconnectionitem.h                |    7 +-
 applet/hiddenwirelessnetworkitem.cpp               |    2 +-
 applet/hiddenwirelessnetworkitem.h                 |    2 +-
 applet/interfacedetailswidget.cpp                  |  207 +++---
 applet/interfacedetailswidget.h                    |   17 +-
 applet/interfaceitem.cpp                           |   91 ++-
 applet/interfaceitem.h                             |   15 +-
 applet/networkmanager.cpp                          |  236 +++----
 applet/networkmanager.h                            |   16 +-
 applet/nmpopup.cpp                                 |  234 +++----
 applet/nmpopup.h                                   |   12 +-
 applet/plasma-applet-networkmanagement.desktop     |    9 +-
 applet/vpninterfaceitem.cpp                        |    2 +-
 applet/vpninterfaceitem.h                          |    2 +-
 applet/wirelessinterfaceitem.cpp                   |   10 +-
 applet/wirelessinterfaceitem.h                     |    5 +-
 applet/wirelessnetworkitem.cpp                     |    2 +
 applet/wirelessstatus.cpp                          |   20 +-
 applet/wirelessstatus.h                            |    2 +-
 backends/NetworkManager/CMakeLists.txt             |   27 +-
 backends/NetworkManager/busconnection.cpp          |  156 -----
 backends/NetworkManager/busconnection.h            |   85 ---
 backends/NetworkManager/config-nm07backend.h.cmake |    3 -
 backends/NetworkManager/config-nm09backend.h.cmake |    2 +
 backends/NetworkManager/connectiondbus.cpp         |   67 ++-
 backends/NetworkManager/connectiondbus.h           |    1 +
 backends/NetworkManager/exportedconnection.cpp     |   53 --
 backends/NetworkManager/exportedconnection.h       |   77 --
 .../NetworkManager/exportedconnectionsecrets.cpp   |   41 --
 .../NetworkManager/exportedconnectionsecrets.h     |   63 --
 backends/NetworkManager/generateDbusAdapters.sh    |    7 +-
 .../introspection/nm-active-connection.xml         |   15 +-
 .../introspection/nm-agent-manager.xml             |   38 +
 .../introspection/nm-connection-secrets.xml        |    2 +-
 .../NetworkManager/introspection/nm-device.xml     |  482 +++++++++++++
 .../introspection/nm-exported-connection.xml       |   64 --
 .../NetworkManager/introspection/nm-ip4-config.xml |   33 +
 .../NetworkManager/introspection/nm-manager.xml    |  399 +++++++++++
 .../introspection/nm-secret-agent.xml              |  164 +++++
 .../introspection/nm-settings-connection.xml       |   96 +++
 .../NetworkManager/introspection/nm-settings.xml   |   19 +-
 .../NetworkManager/nm-active-connectioninterface.h |   10 +-
 backends/NetworkManager/nm-agent-manager.cpp       |   26 +
 backends/NetworkManager/nm-agent-manager.h         |   55 ++
 backends/NetworkManager/nm-device-interface.cpp    |   26 +
 backends/NetworkManager/nm-device-interface.h      |  112 +++
 .../nm-exported-connection-secrets-interface.cpp   |   26 -
 .../nm-exported-connection-secrets-interface.h     |   50 --
 .../nm-exported-connectioninterface.cpp            |   26 -
 .../nm-exported-connectioninterface.h              |   64 --
 .../NetworkManager/nm-ip4-config-interface.cpp     |   26 +
 backends/NetworkManager/nm-ip4-config-interface.h  |   66 ++
 backends/NetworkManager/nm-manager-interface.cpp   |   26 +
 backends/NetworkManager/nm-manager-interface.h     |  171 +++++
 backends/NetworkManager/nm-secret-agentadaptor.cpp |   61 ++
 backends/NetworkManager/nm-secret-agentadaptor.h   |  198 ++++++
 .../nm-settings-connectioninterface.cpp            |   26 +
 .../nm-settings-connectioninterface.h              |   71 ++
 backends/NetworkManager/nm-settingsinterface.h     |   11 +-
 backends/NetworkManager/nm07dbus_export.h          |   40 --
 backends/NetworkManager/nm09dbus_export.h          |   40 ++
 .../nmdbusactiveconnectionmonitor.cpp              |   17 +-
 .../NetworkManager/nmdbusactiveconnectionmonitor.h |    1 +
 backends/NetworkManager/nmdbussecretagent.cpp      |  185 +++++
 backends/NetworkManager/nmdbussecretagent.h        |   66 ++
 .../nmdbussettingsconnectionprovider.cpp           |  339 +++++----
 .../nmdbussettingsconnectionprovider.h             |   16 +-
 backends/NetworkManager/nmdbussettingsservice.cpp  |  320 ---------
 backends/NetworkManager/nmdbussettingsservice.h    |   83 ---
 backends/NetworkManager/pbkdf2.cpp                 |    2 +-
 backends/NetworkManager/remoteconnection.cpp       |   23 +-
 backends/NetworkManager/remoteconnection.h         |    6 +-
 .../settings/802-11-wireless-securitydbus.cpp      |  240 +++----
 .../settings/802-11-wireless-securitydbus.h        |    4 +-
 .../settings/802-11-wirelessdbus.cpp               |  100 ++-
 .../NetworkManager/settings/802-11-wirelessdbus.h  |    4 +-
 backends/NetworkManager/settings/802-1xdbus.cpp    |  248 +++++---
 backends/NetworkManager/settings/802-1xdbus.h      |    4 +-
 .../NetworkManager/settings/802-3-ethernetdbus.cpp |   69 ++-
 .../NetworkManager/settings/802-3-ethernetdbus.h   |    4 +-
 backends/NetworkManager/settings/bluetoothdbus.h   |    4 +-
 backends/NetworkManager/settings/cdmadbus.cpp      |   45 +-
 backends/NetworkManager/settings/cdmadbus.h        |    4 +-
 backends/NetworkManager/settings/gsmdbus.cpp       |   58 +-
 backends/NetworkManager/settings/gsmdbus.h         |    4 +-
 backends/NetworkManager/settings/ipv4dbus.cpp      |  117 +---
 backends/NetworkManager/settings/ipv4dbus.h        |    4 +-
 backends/NetworkManager/settings/ipv6dbus.cpp      |   46 +-
 backends/NetworkManager/settings/ipv6dbus.h        |    4 +-
 backends/NetworkManager/settings/pppdbus.cpp       |   59 +-
 backends/NetworkManager/settings/pppdbus.h         |    4 +-
 backends/NetworkManager/settings/pppoedbus.cpp     |   52 +-
 backends/NetworkManager/settings/pppoedbus.h       |    4 +-
 backends/NetworkManager/settings/serialdbus.cpp    |   38 +-
 backends/NetworkManager/settings/serialdbus.h      |    4 +-
 backends/NetworkManager/settings/vpndbus.cpp       |   53 ++-
 backends/NetworkManager/settings/vpndbus.h         |    4 +-
 dataengine/CMakeLists.txt                          |    4 +-
 dataengine/networkmanagementengine.cpp             |   32 +-
 dataengine/networkmanagementengine.h               |   44 +-
 dataengine/networkmanagementjob.cpp                |   47 --
 dataengine/networkmanagementjob.h                  |   45 --
 dataengine/networkmanagementresources.operations   |   10 -
 dataengine/networkmanagementservice.cpp            |   36 -
 dataengine/networkmanagementservice.h              |   43 --
 dataengine/plasma-engine-networkmanagement.desktop |   39 -
 kded/CMakeLists.txt                                |   10 +
 kded/networkmanagement.desktop                     |    4 -
 kded/nm08connections.cpp                           |  214 ++++++
 kded/nm08connections.h                             |   60 ++
 kded/service.cpp                                   |   68 +--
 kded/service.h                                     |    6 +-
 .../802-11-wireless-securitypersistence.cpp        |  104 +++
 .../802-11-wireless-securitypersistence.h          |   23 +
 kded/settingsnm08/802-11-wirelesspersistence.cpp   |   44 ++
 kded/settingsnm08/802-11-wirelesspersistence.h     |   23 +
 kded/settingsnm08/802-1xpersistence.cpp            |  106 +++
 kded/settingsnm08/802-1xpersistence.h              |   24 +
 kded/settingsnm08/802-3-ethernetpersistence.cpp    |   43 ++
 kded/settingsnm08/802-3-ethernetpersistence.h      |   24 +
 kded/settingsnm08/bluetoothpersistence.cpp         |   24 +
 kded/settingsnm08/bluetoothpersistence.h           |   24 +
 kded/settingsnm08/cdmapersistence.cpp              |   27 +
 kded/settingsnm08/cdmapersistence.h                |   24 +
 kded/settingsnm08/gsmpersistence.cpp               |   34 +
 kded/settingsnm08/gsmpersistence.h                 |   23 +
 kded/settingsnm08/ipv4persistence.cpp              |   81 +++
 kded/settingsnm08/ipv4persistence.h                |   24 +
 kded/settingsnm08/ipv6persistence.cpp              |   78 +++
 kded/settingsnm08/ipv6persistence.h                |   24 +
 kded/settingsnm08/pppoepersistence.cpp             |   26 +
 kded/settingsnm08/pppoepersistence.h               |   24 +
 kded/settingsnm08/ppppersistence.cpp               |   37 +
 kded/settingsnm08/ppppersistence.h                 |   24 +
 kded/settingsnm08/serialpersistence.cpp            |   33 +
 kded/settingsnm08/serialpersistence.h              |   24 +
 kded/settingsnm08/settingpersistence.cpp           |   53 ++
 kded/settingsnm08/settingpersistence.h             |   48 ++
 kded/settingsnm08/vpnpersistence.cpp               |   42 ++
 kded/settingsnm08/vpnpersistence.h                 |   27 +
 libs/client/CMakeLists.txt                         |    2 +-
 libs/client/remoteactivatablelist.cpp              |   35 +-
 libs/client/remoteactivatablelist.h                |    2 +-
 libs/client/remotegsminterfaceconnection.cpp       |    5 +-
 libs/client/remotegsminterfaceconnection.h         |    8 +-
 libs/client/remotegsminterfaceconnection_p.h       |    2 +-
 libs/client/remotewirelessinterfaceconnection.cpp  |   20 +-
 libs/client/remotewirelessinterfaceconnection.h    |   10 +-
 libs/client/remotewirelessnetwork.cpp              |   20 +-
 libs/client/remotewirelessnetwork.h                |   10 +-
 libs/client/remotewirelessobject.h                 |   10 +-
 libs/client/tests/CMakeLists.txt                   |    1 -
 libs/externals/CMakeLists.txt                      |    2 +-
 libs/internals/CMakeLists.txt                      |   32 +-
 libs/internals/activatable.h                       |   16 +-
 libs/internals/connection.cpp                      |  214 +++---
 libs/internals/connection.h                        |   39 +-
 libs/internals/connectionpersistence.cpp           |  327 ---------
 libs/internals/connectionpersistence.h             |  108 ---
 libs/internals/gsminterfaceconnection.cpp          |   12 +-
 libs/internals/gsminterfaceconnection.h            |    8 +-
 libs/internals/gsminterfaceconnectionhelpers.cpp   |   10 +-
 libs/internals/gsminterfaceconnectionhelpers.h     |    8 +-
 libs/internals/gsminterfaceconnectionhelpers_p.h   |    8 +-
 libs/internals/kconfig_compiler.cpp                |   16 +-
 libs/internals/knmserviceprefs.kcfg                |   15 +-
 libs/internals/paths.h                             |   33 +
 libs/internals/schemas/ppp.kcfg                    |    2 +-
 libs/internals/schemas/serial.kcfg                 |    2 +-
 libs/internals/setting.cpp                         |   26 +-
 libs/internals/setting.h                           |   21 +-
 libs/internals/settingpersistence.cpp              |   38 -
 libs/internals/settingpersistence.h                |   50 --
 .../settings/802-11-wireless-security.cpp          |  130 ++++-
 libs/internals/settings/802-11-wireless-security.h |   74 ++-
 .../802-11-wireless-securitypersistence.cpp        |  218 ------
 .../settings/802-11-wireless-securitypersistence.h |   27 -
 libs/internals/settings/802-11-wireless.cpp        |   18 +-
 libs/internals/settings/802-11-wireless.h          |   35 +-
 .../settings/802-11-wirelesspersistence.cpp        |   93 ---
 .../settings/802-11-wirelesspersistence.h          |   27 -
 libs/internals/settings/802-1x.cpp                 |  184 +++---
 libs/internals/settings/802-1x.h                   |  366 ++++++-----
 libs/internals/settings/802-1xpersistence.cpp      |  222 ------
 libs/internals/settings/802-1xpersistence.h        |   27 -
 libs/internals/settings/802-3-ethernet.cpp         |   11 +
 libs/internals/settings/802-3-ethernet.h           |   39 +-
 .../settings/802-3-ethernetpersistence.cpp         |   90 ---
 .../internals/settings/802-3-ethernetpersistence.h |   27 -
 libs/internals/settings/bluetooth.cpp              |    7 +
 libs/internals/settings/bluetooth.h                |   28 +-
 libs/internals/settings/bluetoothpersistence.cpp   |   45 --
 libs/internals/settings/bluetoothpersistence.h     |   27 -
 libs/internals/settings/cdma.cpp                   |   37 +-
 libs/internals/settings/cdma.h                     |   23 +-
 libs/internals/settings/cdmapersistence.cpp        |   57 --
 libs/internals/settings/cdmapersistence.h          |   27 -
 libs/internals/settings/gsm.cpp                    |   54 ++-
 libs/internals/settings/gsm.h                      |   56 ++-
 libs/internals/settings/gsmpersistence.cpp         |   71 --
 libs/internals/settings/gsmpersistence.h           |   27 -
 libs/internals/settings/ipv4.cpp                   |   15 +
 libs/internals/settings/ipv4.h                     |   19 +-
 libs/internals/settings/ipv4persistence.cpp        |  156 -----
 libs/internals/settings/ipv4persistence.h          |   27 -
 libs/internals/settings/ipv6.cpp                   |   13 +
 libs/internals/settings/ipv6.h                     |    3 +-
 libs/internals/settings/ipv6persistence.cpp        |  151 ----
 libs/internals/settings/ipv6persistence.h          |   27 -
 libs/internals/settings/ppp.cpp                    |   24 +-
 libs/internals/settings/ppp.h                      |    1 +
 libs/internals/settings/pppoe.cpp                  |   37 +-
 libs/internals/settings/pppoe.h                    |   23 +-
 libs/internals/settings/pppoepersistence.cpp       |   56 --
 libs/internals/settings/pppoepersistence.h         |   27 -
 libs/internals/settings/ppppersistence.cpp         |   76 --
 libs/internals/settings/ppppersistence.h           |   27 -
 libs/internals/settings/serial.cpp                 |   11 +-
 libs/internals/settings/serial.h                   |    1 +
 libs/internals/settings/serialpersistence.cpp      |   69 --
 libs/internals/settings/serialpersistence.h        |   27 -
 libs/internals/settings/vpn.cpp                    |  130 ++++-
 libs/internals/settings/vpn.h                      |   41 +-
 libs/internals/settings/vpnpersistence.cpp         |  126 ----
 libs/internals/settings/vpnpersistence.h           |   34 -
 libs/internals/settings_hand_edits.diff            |    2 +-
 libs/internals/uiutils.cpp                         |  258 +++++--
 libs/internals/uiutils.h                           |   41 +-
 libs/internals/uiutils_p.h                         |   98 +++
 .../wirelessinterfaceconnectionhelpers.cpp         |   32 +-
 .../internals/wirelessinterfaceconnectionhelpers.h |    6 +-
 .../wirelessinterfaceconnectionhelpers_p.h         |   10 +-
 libs/internals/wirelessnetwork.cpp                 |    2 +-
 libs/internals/wirelessnetwork.h                   |    2 +-
 libs/internals/wirelessobject.cpp                  |   12 +-
 libs/internals/wirelessobject.h                    |   22 +-
 libs/internals/wirelesssecurityidentifier.cpp      |   68 +-
 libs/internals/wirelesssecurityidentifier.h        |    6 +-
 libs/service/CMakeLists.txt                        |   29 +-
 libs/service/activatabledebug.cpp                  |    6 +-
 libs/service/configurationlauncher.cpp             |   43 +-
 libs/service/connectionlistpersistence.cpp         |  299 --------
 libs/service/connectionlistpersistence.h           |  112 ---
 libs/service/connectionlistpersistencedbus.cpp     |    3 +-
 libs/service/connectionusagemonitor.cpp            |   34 +-
 .../gsmnetworkinterfaceactivatableprovider.cpp     |   17 +-
 .../gsmnetworkinterfaceactivatableprovider.h       |   10 +-
 .../networkinterfaceactivatableprovider.cpp        |   26 +-
 libs/service/networkinterfaceactivatableprovider.h |    8 +-
 .../networkinterfaceactivatableprovider_p.h        |    4 +-
 libs/service/networkinterfacemonitor.cpp           |   80 ++-
 libs/service/networkinterfacemonitor.h             |    9 +-
 libs/service/notificationmanager.cpp               |  174 +++---
 libs/service/notificationmanager.h                 |   10 +-
 libs/service/pindialog.cpp                         |    2 -
 libs/service/pindialog.h                           |    3 -
 libs/service/pinwidget.ui                          |    2 +-
 libs/service/secretsprovider.cpp                   |   31 +
 libs/service/secretsprovider.h                     |   57 ++
 libs/service/secretstorage.cpp                     |  332 +++++++++
 libs/service/secretstorage.h                       |   95 +++
 libs/service/sessionabstractedservice.cpp          |    8 +-
 libs/service/sortedactivatablelist.cpp             |   10 +-
 libs/service/sortedactivatablelist.h               |    2 +-
 libs/service/vpninterfaceconnectionprovider.cpp    |    4 +-
 .../wirednetworkinterfaceactivatableprovider.cpp   |    8 +-
 .../wirednetworkinterfaceactivatableprovider.h     |    4 +-
 ...wirelessnetworkinterfaceactivatableprovider.cpp |   37 +-
 .../wirelessnetworkinterfaceactivatableprovider.h  |    4 +-
 libs/types.h                                       |    6 +-
 libs/ui/802-11-wireless.ui                         |  104 +++-
 libs/ui/802_11_wirelesswidget.cpp                  |  217 +++----
 libs/ui/802_11_wirelesswidget.h                    |   14 +-
 libs/ui/CMakeLists.txt                             |   13 +-
 libs/ui/advancedpermissionswidget.cpp              |  145 ++++
 libs/ui/advancedpermissionswidget.h                |   55 ++
 libs/ui/advancedpermissionswidget.ui               |  218 ++++++
 libs/ui/apitemdelegate.cpp                         |    5 +-
 libs/ui/apitemdelegate.h                           |    2 +-
 libs/ui/apitemmodel.cpp                            |    8 +-
 libs/ui/apitemmodel.h                              |    2 +-
 libs/ui/apitemview.cpp                             |    6 +-
 libs/ui/apitemview.h                               |    2 +-
 libs/ui/bluetoothconnectioneditor.cpp              |    6 +-
 libs/ui/bluetoothconnectioneditor.h                |    4 +-
 libs/ui/bluetoothwidget.cpp                        |    8 +-
 libs/ui/cdmaconnectioneditor.h                     |    4 +-
 libs/ui/connection.ui                              |  126 ++--
 libs/ui/connectioneditor.cpp                       |   86 +--
 libs/ui/connectioneditor.h                         |   21 +-
 libs/ui/connectionprefs.cpp                        |   53 +--
 libs/ui/connectionprefs.h                          |    2 -
 libs/ui/connectionsecretsjob.cpp                   |   91 +--
 libs/ui/connectionsecretsjob.h                     |   39 +-
 libs/ui/connectionwidget.cpp                       |   53 +-
 libs/ui/connectionwidget.h                         |    4 +-
 libs/ui/gsm.ui                                     |  436 +++++++------
 libs/ui/gsmconnectioneditor.cpp                    |    2 +-
 libs/ui/gsmconnectioneditor.h                      |    4 +-
 libs/ui/gsmwidget.cpp                              |   50 ++-
 libs/ui/gsmwidget.h                                |    3 +-
 libs/ui/ipv4advancedwidget.cpp                     |   10 +-
 libs/ui/ipv4advancedwidget.h                       |    6 +-
 libs/ui/ipv4routeswidget.cpp                       |   10 +-
 libs/ui/ipv4routeswidget.h                         |    6 +-
 libs/ui/ipv4widget.cpp                             |   26 +-
 libs/ui/ipv6widget.cpp                             |    4 +-
 libs/ui/networkitemmodel.cpp                       |   51 ++-
 libs/ui/networkitemmodel.h                         |    8 +-
 libs/ui/networkmanagement_vpnuiplugin.desktop      |    4 -
 libs/ui/ppp.ui                                     |  263 +++-----
 libs/ui/pppoepreferences.cpp                       |    6 +-
 libs/ui/pppoepreferences.h                         |    4 +-
 libs/ui/scanwidget.cpp                             |   19 +-
 libs/ui/scanwidget.h                               |    2 +-
 libs/ui/security/eapmethod_p.h                     |    1 +
 libs/ui/security/eapmethodinnerauth.cpp            |    8 +
 libs/ui/security/eapmethodinnerauth.h              |    1 +
 libs/ui/security/eapmethodleap.cpp                 |   37 +-
 libs/ui/security/eapmethodleap.h                   |    2 +
 libs/ui/security/eapmethodleapbase.ui              |   48 +-
 libs/ui/security/eapmethodpeapbase.ui              |  125 ++--
 libs/ui/security/eapmethodsimple.cpp               |   36 +-
 libs/ui/security/eapmethodsimple.h                 |    2 +
 libs/ui/security/eapmethodsimplebase.ui            |   40 +-
 libs/ui/security/eapmethodstack.cpp                |    2 +-
 libs/ui/security/eapmethodstack.h                  |    2 +-
 libs/ui/security/eapmethodtlsbase.ui               |  215 +++----
 libs/ui/security/eapmethodttlsbase.ui              |   93 ++-
 libs/ui/security/leap.ui                           |   42 +-
 libs/ui/security/leapauthwidget.cpp                |   85 +++
 libs/ui/security/leapauthwidget.h                  |   51 ++
 libs/ui/security/nullsecuritywidget.cpp            |    2 +-
 libs/ui/security/nullsecuritywidget.h              |    4 +-
 libs/ui/security/peapwidget.cpp                    |  143 +++--
 libs/ui/security/peapwidget.h                      |   10 +-
 libs/ui/security/security8021xauth.cpp             |  131 ++++
 libs/ui/security/security8021xauth.h               |   49 ++
 libs/ui/security/securityeap.cpp                   |    2 +-
 libs/ui/security/securityeap.h                     |    2 +-
 libs/ui/security/securityleap.cpp                  |   41 +-
 libs/ui/security/securityleap.h                    |    5 +-
 libs/ui/security/securitywidget.cpp                |   18 -
 libs/ui/security/securitywidget.h                  |   15 +-
 libs/ui/security/securitywidget_p.h                |    5 -
 libs/ui/security/tlswidget.cpp                     |  305 +++++----
 libs/ui/security/tlswidget.h                       |    7 +-
 libs/ui/security/ttlswidget.cpp                    |  142 +++--
 libs/ui/security/ttlswidget.h                      |    7 +-
 libs/ui/security/wep.ui                            |   33 +-
 libs/ui/security/wepauthwidget.cpp                 |  127 ++++
 libs/ui/security/wepauthwidget.h                   |   50 ++
 libs/ui/security/wepwidget.cpp                     |   87 +--
 libs/ui/security/wepwidget.h                       |    4 +-
 libs/ui/security/wirelesssecurity.ui               |    8 +-
 libs/ui/security/wirelesssecurityauth.cpp          |  109 +++
 libs/ui/security/wirelesssecurityauth.h            |   47 ++
 libs/ui/security/wirelesssecuritysettingwidget.cpp |   73 +--
 libs/ui/security/wirelesssecuritysettingwidget.h   |   10 +-
 libs/ui/security/wpaauthwidget.cpp                 |   85 +++
 libs/ui/security/wpaauthwidget.h                   |   51 ++
 libs/ui/security/wpapsk.ui                         |   13 +-
 libs/ui/security/wpapskwidget.cpp                  |   16 +-
 libs/ui/security/wpapskwidget.h                    |    3 +-
 libs/ui/vpnpreferences.cpp                         |   15 +-
 libs/ui/vpnpreferences.h                           |    4 +-
 libs/ui/vpnuiplugin.cpp                            |   27 +-
 libs/ui/vpnuiplugin.h                              |   28 +-
 libs/ui/wired.ui                                   |  335 ++++++++--
 libs/ui/wiredpreferences.cpp                       |   11 +-
 libs/ui/wiredpreferences.h                         |   10 +-
 libs/ui/wiredwidget.cpp                            |   66 ++-
 libs/ui/wiredwidget.h                              |    3 +-
 libs/ui/wirelesspreferences.cpp                    |   53 +-
 libs/ui/wirelesspreferences.h                      |    7 +-
 monolithic/connectioninfodialog.cpp                |    8 +-
 monolithic/connectioninfodialog.h                  |    2 +-
 monolithic/connectioninfoipv4tab.h                 |    2 +-
 monolithic/kde4-knetworkmanager-autostart.desktop  |    7 -
 monolithic/knetworkmanager.desktop                 |    7 -
 monolithic/knetworkmanagertrayicon.cpp             |   43 +-
 monolithic/tooltipbuilder.cpp                      |    6 +-
 monolithic/unconfiguredinterfaceitem.cpp           |    6 +-
 networkmanagement.notifyrc                         |   67 +--
 plasma_nm_version.h                                |    4 +
 qml/package/contents/code/main.qml                 |    3 +-
 qml/package/metadata.desktop                       |   24 +-
 qml/plasma-applet-networkconnections.desktop       |   19 -
 settings/config/CMakeLists.txt                     |   11 +-
 settings/config/kcm_networkmanagement.desktop      |    5 -
 settings/config/kcm_networkmanagement_tray.desktop |    5 -
 settings/config/manageconnectionwidget.cpp         |  693 ++++++-------------
 settings/config/manageconnectionwidget.h           |   39 +-
 settings/config/manageconnectionwidget.ui          |   20 +-
 settings/config/managetraywidget.cpp               |   13 +-
 settings/config/managetraywidget.h                 |    7 +-
 settings/config/mobileconnectionwizard.cpp         |   38 +-
 settings/config/mobileconnectionwizard.h           |    4 +-
 settings/config/mobileproviders.cpp                |   23 +-
 settings/config/mobileproviders.h                  |    2 +-
 settings/config/othersettings.ui                   |   59 ++-
 settings/config/othersettingswidget.cpp            |    2 +
 settings/configshell/CMakeLists.txt                |   15 +-
 settings/configshell/bluetooth.cpp                 |   82 +---
 settings/configshell/bluetooth.h                   |    6 -
 settings/configshell/main.cpp                      |   19 +-
 settings/configshell/manageconnection.cpp          |   90 +++
 settings/configshell/manageconnection.h            |   39 +
 solidcontrolfuture/CMakeLists.txt                  |    6 +-
 solidcontrolfuture/libs/CMakeLists.txt             |    1 +
 solidcontrolfuture/libs/solid/CMakeLists.txt       |    2 +
 .../libs/solid/control/CMakeLists.txt              |   44 ++
 solidcontrolfuture/libs/solid/control/Messages.sh  |    2 +
 .../libs/solid/control/authentication.cpp          |  336 +++++++++
 .../libs/solid/control/authentication.h            |  309 +++++++++
 .../libs/solid/control/backends/CMakeLists.txt     |    1 +
 .../solid/control/backends/fakenet/CMakeLists.txt  |   31 +
 .../control/backends/fakenet/fakeaccesspoint.cpp   |  142 ++++
 .../control/backends/fakenet/fakeaccesspoint.h     |   57 ++
 .../control/backends/fakenet/fakenetworking.xml    |   97 +++
 .../backends/fakenet/fakenetworkinterface.cpp      |  132 ++++
 .../backends/fakenet/fakenetworkinterface.h        |   70 ++
 .../backends/fakenet/fakenetworkmanager.cpp        |  325 +++++++++
 .../control/backends/fakenet/fakenetworkmanager.h  |   86 +++
 .../backends/fakenet/fakewirednetworkinterface.cpp |   50 ++
 .../backends/fakenet/fakewirednetworkinterface.h   |   51 ++
 .../fakenet/fakewirelessnetworkinterface.cpp       |   78 +++
 .../fakenet/fakewirelessnetworkinterface.h         |   62 ++
 .../libs/solid/control/backends/fakenet/module.cpp |   27 +
 .../control/backends/fakenet/solid_fakenet.desktop |  161 +++++
 .../control/backends/fakenet/tests/CMakeLists.txt  |   18 +
 .../backends/fakenet/tests/fakenetworktest.cpp     |   38 +
 .../backends/fakenet/tests/fakenetworktest.h       |   32 +
 .../libs/solid/control/config-randr.cmake          |    1 +
 .../libs/solid/control/frontendobject.cpp          |   65 ++
 .../libs/solid/control/frontendobject_p.h          |   49 ++
 .../libs/solid/control/ifaces/CMakeLists.txt       |   33 +
 .../libs/solid/control/ifaces/authentication.cpp   |   27 +
 .../libs/solid/control/ifaces/authentication.h     |   58 ++
 .../solid/control/ifaces/networkbtinterface.cpp    |   27 +
 .../libs/solid/control/ifaces/networkbtinterface.h |   81 +++
 .../libs/solid/control/ifaces/networkinterface.cpp |   26 +
 .../libs/solid/control/ifaces/networkinterface.h   |  168 +++++
 .../libs/solid/control/ifaces/networkmanager.cpp   |   32 +
 .../libs/solid/control/ifaces/networkmanager.h     |  227 ++++++
 .../solid/control/ifaces/networkmodeminterface.cpp |   27 +
 .../solid/control/ifaces/networkmodeminterface.h   |   93 +++
 .../solid/control/ifaces/wirednetworkinterface.cpp |   26 +
 .../solid/control/ifaces/wirednetworkinterface.h   |   89 +++
 .../solid/control/ifaces/wirelessaccesspoint.cpp   |   31 +
 .../solid/control/ifaces/wirelessaccesspoint.h     |  162 +++++
 .../control/ifaces/wirelessnetworkinterface.cpp    |   28 +
 .../control/ifaces/wirelessnetworkinterface.h      |  127 ++++
 .../libs/solid/control/managerbase.cpp             |  114 +++
 .../libs/solid/control/managerbase_p.h             |   51 ++
 solidcontrolfuture/libs/solid/control/network_p.h  |   41 ++
 .../libs/solid/control/networkbtinterface.cpp      |  100 +++
 .../libs/solid/control/networkbtinterface.h        |  110 +++
 .../libs/solid/control/networkbtinterface_p.h      |   41 ++
 .../libs/solid/control/networking.cpp              |  324 +++++++++
 solidcontrolfuture/libs/solid/control/networking.h |   99 +++
 .../libs/solid/control/networking_p.h              |  109 +++
 .../libs/solid/control/networkinterface.cpp        |  153 ++++
 .../libs/solid/control/networkinterface.h          |  286 ++++++++
 .../libs/solid/control/networkinterface_p.h        |   42 ++
 .../libs/solid/control/networkipv4config.cpp       |  237 +++++++
 .../libs/solid/control/networkipv4confignm09.h     |   96 +++
 .../libs/solid/control/networkmanager.cpp          |  319 +++++++++
 .../libs/solid/control/networkmanager.h            |  227 ++++++
 .../libs/solid/control/networkmanager_p.h          |   66 ++
 .../libs/solid/control/networkmodeminterface.cpp   |  160 +++++
 .../libs/solid/control/networkmodeminterface.h     |  152 ++++
 .../libs/solid/control/networkmodeminterface_p.h   |   41 ++
 .../solid/control/org.kde.Solid.Networking.xml     |   17 +
 .../libs/solid/control/singletondefs.h             |   56 ++
 .../solid/control}/solid_control_export.h          |    0
 .../libs/solid/control/soliddefs_p.h               |   49 ++
 .../solid/control/solidnetworkmanagernm09.desktop  |   84 +++
 .../libs/solid/control/tests/CMakeLists.txt        |   17 +
 .../libs/solid/control/tests/solidnettest.cpp      |  180 +++++
 .../libs/solid/control/tests/solidnettest.h        |   41 ++
 .../libs/solid/control/wirednetworkinterface.cpp   |  102 +++
 .../libs/solid/control/wirednetworkinterface.h     |  127 ++++
 .../libs/solid/control/wirednetworkinterface_p.h   |   41 ++
 .../libs/solid/control/wirelessaccesspoint.cpp     |  171 +++++
 .../libs/solid/control/wirelessaccesspoint.h       |  191 +++++
 .../solid/control/wirelessnetworkinterface.cpp     |  244 +++++++
 .../libs/solid/control/wirelessnetworkinterface.h  |  178 +++++
 .../solid/control/wirelessnetworkinterface_p.h     |   58 ++
 solidcontrolfuture/solid/CMakeLists.txt            |   13 +
 .../solid/networkmanager-0.9/CMakeLists.txt        |   63 ++
 .../solid/networkmanager-0.9/accesspoint.cpp       |  223 ++++++
 .../solid/networkmanager-0.9/accesspoint.h         |   62 ++
 .../solid/networkmanager-0.9/dbus/CMakeLists.txt   |   63 ++
 .../networkmanager-0.9/dbus/activeconnection.cpp   |   39 +
 .../networkmanager-0.9/dbus/activeconnection.h     |   44 ++
 .../solid/networkmanager-0.9/dbus/do-hand-edits    |   19 +
 .../solid/networkmanager-0.9/dbus/generic-types.h  |   37 +
 .../solid/networkmanager-0.9/dbus/hand-edits.diff  |  138 ++++
 .../networkmanager-0.9/dbus/introspection/all.xml  |   61 ++
 .../dbus/introspection/errors.xml                  |   24 +
 .../dbus/introspection/generic-types.xml           |   35 +
 .../dbus/introspection/nm-access-point.xml         |   93 +++
 .../dbus/introspection/nm-active-connection.xml    |   74 ++
 .../dbus/introspection/nm-agent-manager.xml        |   38 +
 .../dbus/introspection/nm-device-bt.xml            |   49 ++
 .../dbus/introspection/nm-device-ethernet.xml      |   40 ++
 .../dbus/introspection/nm-device-modem.xml         |   65 ++
 .../dbus/introspection/nm-device-olpc-mesh.xml     |   34 +
 .../dbus/introspection/nm-device-wifi.xml          |  112 +++
 .../dbus/introspection/nm-device-wimax.xml         |  104 +++
 .../dbus/introspection/nm-device.xml               |  482 +++++++++++++
 .../dbus/introspection/nm-dhcp4-config.xml         |   22 +
 .../dbus/introspection/nm-dhcp6-config.xml         |   22 +
 .../dbus/introspection/nm-ip4-config.xml           |   33 +
 .../dbus/introspection/nm-ip6-config.xml           |   19 +
 .../dbus/introspection/nm-manager.xml              |  380 ++++++++++
 .../dbus/introspection/nm-ppp-manager.xml          |   22 +
 .../dbus/introspection/nm-secret-agent.xml         |  162 +++++
 .../dbus/introspection/nm-settings-connection.xml  |   93 +++
 .../dbus/introspection/nm-settings.xml             |   85 +++
 .../dbus/introspection/nm-vpn-connection.xml       |  147 ++++
 .../dbus/introspection/nm-vpn-plugin.xml           |  155 +++++
 .../dbus/introspection/nm-wimax-nsp.xml            |   45 ++
 .../dbus/introspection/vpn-errors.xml              |   32 +
 .../dbus/nm-access-pointinterface.cpp              |   28 +
 .../dbus/nm-access-pointinterface.h                |   79 +++
 .../dbus/nm-active-connectioninterface.cpp         |   28 +
 .../dbus/nm-active-connectioninterface.h           |   75 ++
 .../dbus/nm-agent-managerinterface.cpp             |   28 +
 .../dbus/nm-agent-managerinterface.h               |   55 ++
 .../dbus/nm-device-btinterface.cpp                 |   28 +
 .../dbus/nm-device-btinterface.h                   |   55 ++
 .../dbus/nm-device-ethernetinterface.cpp           |   28 +
 .../dbus/nm-device-ethernetinterface.h             |   59 ++
 .../dbus/nm-device-modeminterface.cpp              |   28 +
 .../dbus/nm-device-modeminterface.h                |   51 ++
 .../dbus/nm-device-wifiinterface.cpp               |   28 +
 .../dbus/nm-device-wifiinterface.h                 |   75 ++
 .../dbus/nm-device-wimaxinterface.cpp              |   28 +
 .../dbus/nm-device-wimaxinterface.h                |   79 +++
 .../networkmanager-0.9/dbus/nm-deviceinterface.cpp |   28 +
 .../networkmanager-0.9/dbus/nm-deviceinterface.h   |  109 +++
 .../dbus/nm-dhcp4-configinterface.cpp              |   28 +
 .../dbus/nm-dhcp4-configinterface.h                |   47 ++
 .../dbus/nm-dhcp6-configinterface.cpp              |   28 +
 .../dbus/nm-dhcp6-configinterface.h                |   47 ++
 .../dbus/nm-ip4-configinterface.cpp                |   28 +
 .../dbus/nm-ip4-configinterface.h                  |   64 ++
 .../dbus/nm-managerinterface.cpp                   |   28 +
 .../networkmanager-0.9/dbus/nm-managerinterface.h  |  165 +++++
 .../dbus/nm-secret-agentinterface.cpp              |   28 +
 .../dbus/nm-secret-agentinterface.h                |   70 ++
 .../dbus/nm-vpn-connectioninterface.cpp            |   28 +
 .../dbus/nm-vpn-connectioninterface.h              |   52 ++
 .../dbus/nm-vpn-plugininterface.cpp                |   28 +
 .../dbus/nm-vpn-plugininterface.h                  |   86 +++
 .../dbus/nm-wimax-nspinterface.cpp                 |   28 +
 .../dbus/nm-wimax-nspinterface.h                   |   55 ++
 .../networkmanager-0.9/dbus/qt-annotations.diff    |  120 ++++
 .../solid/networkmanager-0.9/manager.cpp           |  388 +++++++++++
 .../solid/networkmanager-0.9/manager.h             |   77 ++
 .../solid/networkmanager-0.9/manager_p.h           |   48 ++
 .../solid/networkmanager-0.9/module.cpp            |   27 +
 .../networkmanager-0.9/networkbtinterface.cpp      |   92 +++
 .../solid/networkmanager-0.9/networkbtinterface.h  |   56 ++
 .../networkmanager-0.9/networkbtinterface_p.h      |   37 +
 .../solid/networkmanager-0.9/networkinterface.cpp  |  277 ++++++++
 .../solid/networkmanager-0.9/networkinterface.h    |   97 +++
 .../solid/networkmanager-0.9/networkinterface_p.h  |   52 ++
 .../networkmanager-0.9/networkmanagerdefinitions.h |   33 +
 .../networkmanager-0.9/networkmodeminterface.cpp   |  173 +++++
 .../networkmanager-0.9/networkmodeminterface.h     |   66 ++
 .../networkmanager-0.9/networkmodeminterface_p.h   |   36 +
 .../solid/networkmanager-0.9/nmpropertyhelper.cpp  |   42 ++
 .../solid/networkmanager-0.9/nmpropertyhelper.h    |   62 ++
 .../solid/networkmanager-0.9/nmpropertytest.cpp    |   44 ++
 .../solid_networkmanager09.desktop                 |  156 +++++
 .../networkmanager-0.9/wirednetworkinterface.cpp   |  122 ++++
 .../networkmanager-0.9/wirednetworkinterface.h     |   58 ++
 .../networkmanager-0.9/wirednetworkinterface_p.h   |   39 +
 .../wirelessnetworkinterface.cpp                   |  214 ++++++
 .../networkmanager-0.9/wirelessnetworkinterface.h  |   68 ++
 .../wirelessnetworkinterface_p.h                   |   43 ++
 solidcontrolfuture/wirelessnetwork.cpp             |   18 +-
 solidcontrolfuture/wirelessnetwork.h               |    6 +-
 solidcontrolfuture/wirelessnetwork_p.h             |    4 +-
 .../wirelessnetworkinterfaceenvironment.cpp        |   10 +-
 .../wirelessnetworkinterfaceenvironment.h          |    4 +-
 tests/CMakeLists.txt                               |   12 +-
 tools/list-connections                             |    6 +-
 vpnplugins/CMakeLists.txt                          |    1 +
 .../networkmanagement_novellvpnui.desktop          |    4 -
 vpnplugins/novellvpn/novellvpn.cpp                 |   10 +-
 vpnplugins/novellvpn/novellvpn.h                   |    3 +-
 vpnplugins/novellvpn/novellvpnwidget.cpp           |   14 +-
 vpnplugins/novellvpn/novellvpnwidget.h             |    2 +-
 vpnplugins/openconnect/CMakeLists.txt              |   31 +
 vpnplugins/openconnect/FindOpenConnect.cmake       |   38 +
 vpnplugins/openconnect/README                      |   89 +++
 .../networkmanagement_openconnectui.desktop        |   17 +
 vpnplugins/openconnect/nm-openconnect-service.h    |   47 ++
 vpnplugins/openconnect/openconnectauth.cpp         |  606 ++++++++++++++++
 vpnplugins/openconnect/openconnectauth.h           |   74 ++
 vpnplugins/openconnect/openconnectauth.ui          |  201 ++++++
 .../openconnect/openconnectauthworkerthread.cpp    |  171 +++++
 .../openconnect/openconnectauthworkerthread.h      |   61 ++
 vpnplugins/openconnect/openconnectprop.ui          |  159 +++++
 vpnplugins/openconnect/openconnectui.cpp           |   80 +++
 vpnplugins/openconnect/openconnectui.h             |   49 ++
 vpnplugins/openconnect/openconnectwidget.cpp       |  105 +++
 vpnplugins/openconnect/openconnectwidget.h         |   51 ++
 vpnplugins/openvpn/CMakeLists.txt                  |    1 +
 .../openvpn/networkmanagement_openvpnui.desktop    |    5 -
 vpnplugins/openvpn/nm-openvpn-service.h            |   24 +-
 vpnplugins/openvpn/openvpn.cpp                     |  593 ++++++++++++++++-
 vpnplugins/openvpn/openvpn.h                       |    4 +-
 vpnplugins/openvpn/openvpnauth.cpp                 |  156 +++++
 vpnplugins/openvpn/openvpnauth.h                   |   53 ++
 vpnplugins/openvpn/openvpnprop.ui                  |  611 ++++++++++++++---
 vpnplugins/openvpn/openvpnwidget.cpp               |  493 +++++++++++---
 vpnplugins/openvpn/openvpnwidget.h                 |   12 +
 vpnplugins/pptp/CMakeLists.txt                     |    3 +-
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |    4 -
 vpnplugins/pptp/pptp.cpp                           |   16 +-
 vpnplugins/pptp/pptp.h                             |    4 +-
 vpnplugins/pptp/pptpauth.cpp                       |   68 ++
 vpnplugins/pptp/pptpauth.h                         |   53 ++
 vpnplugins/pptp/pptpauth.ui                        |  170 ++---
 vpnplugins/pptp/pptpprop.ui                        |   29 +-
 vpnplugins/pptp/pptpwidget.cpp                     |  192 +++---
 vpnplugins/pptp/pptpwidget.h                       |    5 +-
 vpnplugins/strongswan/CMakeLists.txt               |    3 +-
 .../networkmanagement_strongswanui.desktop         |    4 -
 vpnplugins/strongswan/nm-strongswan-service.h      |   10 +-
 vpnplugins/strongswan/strongswan.cpp               |   15 +-
 vpnplugins/strongswan/strongswan.h                 |    4 +-
 vpnplugins/strongswan/strongswanauth.cpp           |  117 ++++
 vpnplugins/strongswan/strongswanauth.h             |   55 ++
 vpnplugins/strongswan/strongswanauth.ui            |   84 +--
 vpnplugins/strongswan/strongswanprop.ui            |  563 ++++++++++-----
 vpnplugins/strongswan/strongswanwidget.cpp         |  153 +++--
 vpnplugins/strongswan/strongswanwidget.h           |    3 +
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |    4 -
 vpnplugins/vpnc/nm-vpnc-service.h                  |   19 +-
 vpnplugins/vpnc/vpnc.cpp                           |  103 ++-
 vpnplugins/vpnc/vpnc.h                             |    3 +-
 vpnplugins/vpnc/vpncauth.cpp                       |   39 +-
 vpnplugins/vpnc/vpncauth.h                         |    5 +-
 vpnplugins/vpnc/vpncauth.ui                        |   57 ++-
 vpnplugins/vpnc/vpncprop.ui                        |  727 ++++++++++++++------
 vpnplugins/vpnc/vpncwidget.cpp                     |  299 ++++++--
 vpnplugins/vpnc/vpncwidget.h                       |    7 +-
 661 files changed, 32344 insertions(+), 10301 deletions(-)

The diff has been stripped from this email because it exceeds 50KB


-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list