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

Modestas Vainius modax-guest at alioth.debian.org
Sat Aug 1 11:22:02 UTC 2009


The following commit has been merged in the master branch:
commit 6e4094029f1745d50ac0b60844d7aec652d5f5d0
Merge: cf023e0ba3ced7a0ee533c7283d9fe8b84cf031e 3b77b17e69e09b8e99c30399d91afd146691e170
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Aug 1 09:35:26 2009 +0300

    Merge branch 'upstream'

 CMakeLists.txt                                     |    7 +-
 applet/CMakeLists.txt                              |   14 +-
 applet/Messages.sh                                 |    2 +-
 applet/README.txt                                  |   10 +
 applet/activatableitem.cpp                         |    9 +-
 applet/activatableitem.h                           |    4 +
 applet/activatablelistwidget.cpp                   |  184 ++++++
 applet/activatablelistwidget.h                     |   68 +++
 applet/applet_wip.cpp                              |   68 +++
 applet/applet_wip.h                                |   53 ++
 applet/connectionlist.h                            |   91 ---
 applet/{ => deprecated}/connectionlist.cpp         |    0 
 applet/deprecated/connectionlist.h                 |   93 +++
 applet/{ => deprecated}/generalextender.cpp        |    0 
 applet/{ => deprecated}/generalextender.h          |    0 
 applet/deprecated/interfacegroup.cpp               |  503 ++++++++++++++++
 applet/deprecated/interfacegroup.h                 |   89 +++
 .../wirelessinterfaceconnectionitem.cpp            |    0 
 .../wirelessinterfaceconnectionitem.h              |    0 
 applet/interfaceconnectionitem.cpp                 |   13 +-
 applet/interfaceconnectionitem.h                   |    4 +-
 applet/interfacegroup.cpp                          |  522 -----------------
 applet/interfacegroup.h                            |   90 ---
 applet/interfaceitem.cpp                           |  228 ++++----
 applet/interfaceitem.h                             |   28 +-
 applet/networkmanagement.svg                       |   36 +-
 applet/networkmanager.cpp                          |  279 +++-------
 applet/networkmanager.h                            |   37 +-
 applet/nmextenderitem.cpp                          |  416 ++++++++++++++
 applet/nmextenderitem.h                            |  102 ++++
 applet/plasma-applet-networkmanagement.desktop     |    1 +
 applet/wirelessinterfaceitem.cpp                   |    7 +-
 applet/wirelessinterfaceitem.h                     |    4 +-
 applet/wirelessnetworkitem.cpp                     |   79 ++-
 applet/wirelessnetworkitem.h                       |   12 +-
 .../802-11-wireless-securitydbus.cpp               |  184 ------
 .../NetworkManager/802-11-wireless-securitydbus.h  |   30 -
 backends/NetworkManager/802-11-wirelessdbus.cpp    |  103 ----
 backends/NetworkManager/802-11-wirelessdbus.h      |   26 -
 backends/NetworkManager/802-1xdbus.h               |   26 -
 backends/NetworkManager/802-3-ethernetdbus.h       |   26 -
 backends/NetworkManager/CMakeLists.txt             |   23 +-
 backends/NetworkManager/cdmadbus.h                 |   26 -
 backends/NetworkManager/config-knmstorage.h.cmake  |    1 -
 backends/NetworkManager/config-nm07backend.h.cmake |    3 +
 backends/NetworkManager/gsmdbus.h                  |   26 -
 backends/NetworkManager/ipv4dbus.cpp               |  101 ----
 backends/NetworkManager/ipv4dbus.h                 |   26 -
 backends/NetworkManager/nm07dbus_export.h          |   40 ++
 .../nmdbusactiveconnectionmonitor.cpp              |   91 ++--
 .../NetworkManager/nmdbusactiveconnectionmonitor.h |   17 +-
 .../nmdbussettingsconnectionprovider.h             |    2 +-
 backends/NetworkManager/nmdbussettingsservice.cpp  |   21 +-
 backends/NetworkManager/nmdbussettingsservice.h    |    6 +
 backends/NetworkManager/pbkdf2.cpp                 |    2 +-
 backends/NetworkManager/pppdbus.h                  |   26 -
 backends/NetworkManager/pppoedbus.h                |   26 -
 backends/NetworkManager/serialdbus.h               |   26 -
 .../802-11-wireless-security_nmdbus.cpp            |    0 
 .../802-11-wireless-security_nmdbus.h              |    0 
 .../settings/802-11-wireless-securitydbus.cpp      |  203 +++++++
 .../settings/802-11-wireless-securitydbus.h        |   30 +
 .../{ => settings}/802-11-wireless_nmdbus.cpp      |    0 
 .../{ => settings}/802-11-wireless_nmdbus.h        |    0 
 .../settings/802-11-wirelessdbus.cpp               |  103 ++++
 .../NetworkManager/settings/802-11-wirelessdbus.h  |   26 +
 .../{ => settings}/802-1x_nmdbus.cpp               |    0 
 .../NetworkManager/{ => settings}/802-1x_nmdbus.h  |    0 
 .../NetworkManager/{ => settings}/802-1xdbus.cpp   |    0 
 backends/NetworkManager/settings/802-1xdbus.h      |   26 +
 .../{ => settings}/802-3-ethernet_nmdbus.cpp       |    0 
 .../{ => settings}/802-3-ethernet_nmdbus.h         |    0 
 .../{ => settings}/802-3-ethernetdbus.cpp          |    0 
 .../NetworkManager/settings/802-3-ethernetdbus.h   |   26 +
 .../NetworkManager/{ => settings}/cdma_nmdbus.cpp  |    0 
 .../NetworkManager/{ => settings}/cdma_nmdbus.h    |    0 
 .../NetworkManager/{ => settings}/cdmadbus.cpp     |    0 
 backends/NetworkManager/settings/cdmadbus.h        |   26 +
 .../NetworkManager/{ => settings}/gsm_nmdbus.cpp   |    0 
 .../NetworkManager/{ => settings}/gsm_nmdbus.h     |    0 
 backends/NetworkManager/{ => settings}/gsmdbus.cpp |    0 
 backends/NetworkManager/settings/gsmdbus.h         |   26 +
 .../NetworkManager/{ => settings}/ipv4_nmdbus.cpp  |    0 
 .../NetworkManager/{ => settings}/ipv4_nmdbus.h    |    0 
 backends/NetworkManager/settings/ipv4dbus.cpp      |  102 ++++
 backends/NetworkManager/settings/ipv4dbus.h        |   26 +
 .../NetworkManager/{ => settings}/ppp_nmdbus.cpp   |    0 
 .../NetworkManager/{ => settings}/ppp_nmdbus.h     |    0 
 backends/NetworkManager/{ => settings}/pppdbus.cpp |    0 
 backends/NetworkManager/settings/pppdbus.h         |   26 +
 .../NetworkManager/{ => settings}/pppoe_nmdbus.cpp |    0 
 .../NetworkManager/{ => settings}/pppoe_nmdbus.h   |    0 
 .../NetworkManager/{ => settings}/pppoedbus.cpp    |    0 
 backends/NetworkManager/settings/pppoedbus.h       |   26 +
 .../{ => settings}/serial_nmdbus.cpp               |    0 
 .../NetworkManager/{ => settings}/serial_nmdbus.h  |    0 
 .../NetworkManager/{ => settings}/serialdbus.cpp   |    0 
 backends/NetworkManager/settings/serialdbus.h      |   26 +
 .../NetworkManager/{ => settings}/vpn_nmdbus.cpp   |    0 
 .../NetworkManager/{ => settings}/vpn_nmdbus.h     |    0 
 backends/NetworkManager/{ => settings}/vpndbus.cpp |    0 
 backends/NetworkManager/settings/vpndbus.h         |   26 +
 backends/NetworkManager/vpndbus.h                  |   26 -
 kded/CMakeLists.txt                                |   16 +-
 kded/networkmanagement.desktop                     |   23 +-
 kded/service.cpp                                   |  549 +++---------------
 kded/service.h                                     |   78 +---
 libs/client/CMakeLists.txt                         |    9 +-
 libs/client/remoteactivatable.h                    |    1 -
 libs/client/remoteactivatablelist.cpp              |   40 +-
 libs/client/remoteactivatablelist.h                |    2 +-
 libs/client/remoteinterfaceconnection.h            |    2 +-
 libs/client/remoteunconfiguredinterface.h          |    2 +-
 libs/client/remotevpninterfaceconnection.h         |    2 +-
 libs/client/remotewirelessinterfaceconnection.cpp  |    7 +
 libs/client/remotewirelessinterfaceconnection.h    |    7 +-
 libs/client/remotewirelessnetwork.cpp              |   79 +++
 libs/client/remotewirelessnetwork.h                |   62 ++
 libs/client/remotewirelessnetwork_p.h              |   34 ++
 libs/client/remotewirelessnetworkitem.cpp          |   64 --
 libs/client/remotewirelessnetworkitem.h            |   58 --
 libs/client/remotewirelessnetworkitem_p.h          |   34 --
 libs/client/remotewirelessobject.cpp               |   28 +
 libs/client/remotewirelessobject.h                 |   40 ++
 libs/internals/CMakeLists.txt                      |    6 +-
 libs/internals/activatable.h                       |    2 +-
 libs/internals/connectionpersistence.cpp           |   18 +-
 libs/internals/connectionpersistence.h             |    2 +-
 libs/internals/interfaceconnection.cpp             |   12 +-
 libs/internals/interfaceconnection.h               |    4 +-
 libs/internals/kconfig_compiler.cpp                |    8 +-
 libs/internals/knmserviceprefs.kcfg                |   25 +-
 libs/internals/regenerate_patch_from_clean         |    1 +
 .../schemas/802-11-wireless-security.kcfg          |   92 +++
 .../schemas/802-11-wireless-security.kcfgc         |    5 +
 .../internals}/schemas/802-11-wireless.kcfg        |    0 
 libs/internals/schemas/802-11-wireless.kcfgc       |    5 +
 {settings => libs/internals}/schemas/802-1x.kcfg   |    0 
 libs/internals/schemas/802-1x.kcfgc                |    5 +
 .../internals}/schemas/802-3-ethernet.kcfg         |    0 
 libs/internals/schemas/802-3-ethernet.kcfgc        |    5 +
 {settings => libs/internals}/schemas/cdma.kcfg     |    0 
 libs/internals/schemas/cdma.kcfgc                  |    5 +
 .../internals}/schemas/connection.kcfg             |    0 
 {settings => libs/internals}/schemas/gsm.kcfg      |    0 
 libs/internals/schemas/gsm.kcfgc                   |    5 +
 {settings => libs/internals}/schemas/ipv4.kcfg     |    0 
 libs/internals/schemas/ipv4.kcfgc                  |    5 +
 {settings => libs/internals}/schemas/ppp.kcfg      |    0 
 libs/internals/schemas/ppp.kcfgc                   |    5 +
 {settings => libs/internals}/schemas/pppoe.kcfg    |    0 
 libs/internals/schemas/pppoe.kcfgc                 |    5 +
 {settings => libs/internals}/schemas/serial.kcfg   |    0 
 libs/internals/schemas/serial.kcfgc                |    5 +
 {settings => libs/internals}/schemas/vpn.kcfg      |    0 
 libs/internals/schemas/vpn.kcfgc                   |    5 +
 libs/internals/settings/802-11-wireless-security.h |    2 +-
 .../802-11-wireless-securitypersistence.cpp        |    9 +-
 libs/internals/settings_hand_edits.diff            |  283 ++++++----
 libs/internals/update_clean_settings               |    1 +
 libs/internals/update_settings_and_apply_patch     |    1 +
 libs/internals/wirelessinterfaceconnection.cpp     |    6 +-
 libs/internals/wirelessinterfaceconnection.h       |    6 +-
 libs/internals/wirelessitem.cpp                    |   65 ---
 libs/internals/wirelessitem.h                      |   53 --
 libs/internals/wirelessnetwork.cpp                 |   41 ++
 libs/internals/wirelessnetwork.h                   |   51 ++
 libs/internals/wirelessnetworkitem.cpp             |   41 --
 libs/internals/wirelessnetworkitem.h               |   51 --
 libs/internals/wirelessobject.cpp                  |   75 +++
 libs/internals/wirelessobject.h                    |   55 ++
 libs/internals/wpasecretidentifier.cpp             |   57 ++
 libs/internals/wpasecretidentifier.h               |   35 ++
 libs/service/CMakeLists.txt                        |   25 +-
 libs/service/activatabledebug.cpp                  |   16 +-
 libs/service/activatabledebug.h                    |    4 +-
 libs/service/activatablelist.cpp                   |   33 +-
 libs/service/activatablelist.h                     |   24 +-
 libs/service/activatablelist_p.h                   |   40 ++
 libs/service/configurationlauncher.cpp             |   15 +-
 libs/service/configurationlauncher.h               |    8 +-
 libs/service/connectionlistpersistence.cpp         |    9 +-
 libs/service/connectionusagemonitor.cpp            |    2 +-
 libs/service/connectionusagemonitor.h              |    2 +-
 libs/service/events.cpp                            |   37 ++
 libs/service/events.h                              |   44 ++
 libs/service/hiddenwirelessnetwork.cpp             |   32 +
 libs/service/hiddenwirelessnetwork.h               |   38 ++
 libs/service/hiddenwirelessnetworkitem.cpp         |   32 -
 libs/service/hiddenwirelessnetworkitem.h           |   38 --
 ...tworkmanagement.wirelessinterfaceconnection.xml |    4 +
 .../org.kde.networkmanagement.wirelessitem.xml     |   18 -
 .../org.kde.networkmanagement.wirelessnetwork.xml  |   32 +
 ...g.kde.networkmanagement.wirelessnetworkitem.xml |   25 -
 .../org.kde.networkmanagement.wirelessobject.xml   |   24 +
 libs/service/notificationmanager.cpp               |  425 ++++++++++++++
 libs/service/notificationmanager.h                 |   62 ++
 libs/service/sessionabstractedservice.cpp          |   30 +-
 libs/service/sessionabstractedservice.h            |    7 +-
 libs/service/sortedactivatablelist.cpp             |  318 +++++++++++
 libs/service/sortedactivatablelist.h               |   90 +++
 ...wirelessnetworkinterfaceactivatableprovider.cpp |   75 ++--
 .../wirelessnetworkinterfaceactivatableprovider.h  |    4 +-
 libs/ui/connectionprefs.cpp                        |    9 +-
 libs/ui/connectionsecretsjob.cpp                   |   19 +-
 libs/ui/connectionwidget.cpp                       |    5 +
 libs/ui/connectionwidget.h                         |    4 +
 libs/ui/ipv4.ui                                    |   14 +-
 libs/ui/ipv4widget.cpp                             |    8 +-
 libs/ui/security/wpapskwidget.cpp                  |   14 +-
 monolithic/CMakeLists.txt                          |   30 +-
 monolithic/Messages.sh                             |    3 +
 monolithic/activatableitem.cpp                     |   18 +-
 monolithic/activatableitem.h                       |   19 +-
 monolithic/activatableitem_p.h                     |    3 +
 monolithic/icons/CMakeLists.txt                    |    2 +
 monolithic/icons/hi32-app-knetworkmanager.png      |  Bin 0 -> 1802 bytes
 .../icons/ox22-device-network-wireless-00.png      |  Bin 0 -> 1331 bytes
 .../icons/ox22-device-network-wireless-100.png     |  Bin 0 -> 1293 bytes
 .../icons/ox22-device-network-wireless-25.png      |  Bin 0 -> 1349 bytes
 .../icons/ox22-device-network-wireless-50.png      |  Bin 0 -> 1350 bytes
 .../icons/ox22-device-network-wireless-75.png      |  Bin 0 -> 1352 bytes
 monolithic/interfaceconnectionitem.cpp             |  168 +++++--
 monolithic/interfaceconnectionitem.h               |    4 +
 monolithic/interfaceconnectionitem_p.h             |    7 +-
 monolithic/kde4-knetworkmanager-autostart.desktop  |   27 +
 monolithic/knetworkmanager.desktop                 |   26 +
 monolithic/knetworkmanagertrayicon.cpp             |  388 ++++++++++---
 monolithic/knetworkmanagertrayicon.h               |   41 ++-
 monolithic/main.cpp                                |   46 ++
 monolithic/monolithic.cpp                          |  158 ++++--
 monolithic/monolithic.h                            |   43 ++
 monolithic/sortedactivatablelist.cpp               |  302 ----------
 monolithic/sortedactivatablelist.h                 |   83 ---
 monolithic/tooltipbuilder.cpp                      |  602 ++++++++++++++++++++
 monolithic/tooltipbuilder.h                        |   42 ++
 monolithic/unconfiguredinterfaceitem.cpp           |    4 +-
 monolithic/unconfiguredinterfaceitem.h             |    2 +-
 monolithic/wirelessinterfaceconnectionitem.cpp     |   14 +-
 monolithic/wirelessinterfaceconnectionitem.h       |    5 +-
 monolithic/wirelessnetworkitem.cpp                 |   57 ++
 monolithic/wirelessnetworkitem.h                   |   44 ++
 monolithic/wirelessnetworkitemitem.cpp             |   58 --
 monolithic/wirelessnetworkitemitem.h               |   44 --
 monolithic/wirelessstatus.cpp                      |   79 ++-
 monolithic/wirelessstatus.h                        |    3 +-
 networkmanagement.notifyrc                         |  216 +++----
 settings/config/CMakeLists.txt                     |    3 +-
 settings/config/Messages.sh                        |    2 +-
 settings/config/manageconnectionwidget.cpp         |   40 ++-
 settings/config/manageconnectionwidget.h           |   34 +-
 settings/config/manageconnectionwidget.ui          |  133 +++---
 settings/config/traysettings.ui                    |  126 ++++
 settings/config/traysettingswidget.cpp             |  228 ++++++++
 settings/config/traysettingswidget.h               |   53 ++
 settings/configshell/main.cpp                      |    9 +-
 settings/schemas/802-11-wireless-security.kcfg     |   91 ---
 settings/schemas/802-11-wireless-security.kcfgc    |    5 -
 settings/schemas/802-11-wireless.kcfgc             |    5 -
 settings/schemas/802-1x.kcfgc                      |    5 -
 settings/schemas/802-3-ethernet.kcfgc              |    5 -
 settings/schemas/cdma.kcfgc                        |    5 -
 settings/schemas/gsm.kcfgc                         |    5 -
 settings/schemas/ipv4.kcfgc                        |    5 -
 settings/schemas/ppp.kcfgc                         |    5 -
 settings/schemas/pppoe.kcfgc                       |    5 -
 settings/schemas/serial.kcfgc                      |    5 -
 settings/schemas/vpn.kcfgc                         |    5 -
 solidcontrolfuture/CMakeLists.txt                  |    8 +-
 269 files changed, 7453 insertions(+), 4282 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list