[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1-svn1054632-1

Modestas Vainius modax-guest at alioth.debian.org
Thu Nov 26 22:34:04 UTC 2009


The following commit has been merged in the master branch:
commit 5e4556a0cd280f0366c1a388388838b5f325f3b0
Merge: 00c924dbfdd3b8680eb00ed74597b791d7aca3c2 9abdb4a8dfe862c7b5254d64b6c8fa136efca269
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Nov 26 23:27:38 2009 +0200

    Merge branch 'upstream'

 NetworkManager-kde4.conf                           |   28 +-
 applet/CMakeLists.txt                              |   20 +-
 applet/README.txt                                  |   35 +-
 applet/activatableitem.cpp                         |   28 +-
 applet/activatableitem.h                           |   15 +-
 applet/activatablelistwidget.cpp                   |   41 +-
 applet/activatablelistwidget.h                     |    4 +-
 applet/applet_wip.cpp                              |   68 --
 applet/applet_wip.h                                |   53 -
 applet/generic-types.h                             |   28 -
 applet/hiddenwirelessnetworkitem.cpp               |   38 +-
 applet/hiddenwirelessnetworkitem.h                 |   68 +-
 applet/interfaceconnectionitem.cpp                 |   41 +-
 applet/interfaceconnectionitem.h                   |   23 +-
 applet/interfaceitem.cpp                           |  212 +---
 applet/interfaceitem.h                             |   22 +-
 applet/networkmanagement-wireless.svgz             |  Bin 6237 -> 0 bytes
 applet/networkmanagement.svg                       |  611 ----------
 applet/networkmanager.cpp                          |  554 ++++-----
 applet/networkmanager.h                            |   55 +-
 applet/nmextenderitem.cpp                          |  213 +---
 applet/nmextenderitem.h                            |   16 +-
 applet/pics/CMakeLists.txt                         |    1 -
 applet/pics/accesspoint.svg                        |  120 --
 applet/pics/ox32-action-accesspoint.png            |  Bin 660 -> 0 bytes
 applet/plasma-applet-networkmanagement.desktop     |   28 +-
 applet/wiredinterfaceitem.cpp                      |   65 -
 applet/wirelessinterfaceitem.cpp                   |   19 +-
 applet/wirelessinterfaceitem.h                     |    3 +-
 applet/wirelessnetworkitem.cpp                     |   98 +-
 applet/wirelessnetworkitem.h                       |   51 +-
 backends/NetworkManager/CMakeLists.txt             |    7 +-
 backends/NetworkManager/busconnection.h            |    2 +-
 backends/NetworkManager/connectiondbus.cpp         |    5 +-
 .../introspection/nm-vpn-connection.xml            |  137 +++
 .../NetworkManager/nm-vpn-connectioninterface.cpp  |   28 +
 .../NetworkManager/nm-vpn-connectioninterface.h    |   61 +
 .../nmdbusactiveconnectionmonitor.cpp              |  244 ++--
 .../NetworkManager/nmdbusactiveconnectionmonitor.h |   42 +-
 .../nmdbussettingsconnectionprovider.cpp           |    2 +-
 backends/NetworkManager/nmdbussettingsservice.cpp  |   37 +-
 backends/NetworkManager/nmdbussettingsservice.h    |    3 +-
 backends/NetworkManager/remoteconnection.cpp       |    2 +-
 backends/NetworkManager/settingdbus.cpp            |   22 +
 backends/NetworkManager/settingdbus.h              |    3 +
 .../settings/802-11-wireless-securitydbus.cpp      |   20 +-
 backends/NetworkManager/settings/ipv4dbus.cpp      |   90 +-
 backends/NetworkManager/settings/pppdbus.cpp       |   14 -
 backends/NetworkManager/settings/pppdbus.h         |    3 -
 backends/NetworkManager/settings/serialdbus.cpp    |   28 +-
 backends/NetworkManager/settings/serialdbus.h      |    2 -
 backends/NetworkManager/wephash.cpp                |    2 +-
 kded/networkmanagement.desktop                     |   28 +-
 libs/client/remoteactivatable.cpp                  |    4 +-
 libs/client/remoteactivatablelist.cpp              |    6 +-
 libs/client/remoteinterfaceconnection.cpp          |   23 +
 libs/client/remoteinterfaceconnection.h            |    7 +
 libs/internals/CMakeLists.txt                      |    4 +-
 libs/internals/configxml.cpp                       |   10 +-
 libs/internals/connection.cpp                      |    1 +
 libs/internals/connectionpersistence.cpp           |   19 +-
 libs/internals/interfaceconnection.cpp             |    5 +-
 libs/internals/interfaceconnection.h               |    2 +-
 libs/internals/kconfig_compiler.cpp                |    8 +-
 libs/internals/knmserviceprefs.kcfg                |    7 +
 libs/internals/schemas/ipv4.kcfg                   |   19 +
 libs/internals/schemas/serial.kcfg                 |    9 +-
 libs/internals/secretstoragehelper.cpp             |    2 +-
 libs/internals/settings/ipv4.cpp                   |    4 +-
 libs/internals/settings/ipv4.h                     |   68 ++
 libs/internals/settings/ipv4persistence.cpp        |   20 +-
 libs/internals/settings/serial.cpp                 |    2 +-
 libs/internals/settings/serial.h                   |    6 +-
 libs/internals/settings/serialpersistence.cpp      |   25 +-
 libs/internals/settings/wephash.cpp                |    2 +-
 libs/internals/settings_hand_edits.diff            | 1259 ++++++++++++++++++--
 libs/internals/uiutils.cpp                         |  305 +++++
 libs/internals/uiutils.h                           |   91 ++
 libs/internals/wirelesssecurityidentifier.cpp      |   36 +
 libs/internals/wirelesssecurityidentifier.h        |    1 +
 libs/service/activatablelist.cpp                   |    9 +-
 libs/service/activatablelist.h                     |    1 +
 libs/service/configurationlauncher.cpp             |    2 +-
 libs/service/connectionlistpersistence.cpp         |   14 +-
 ...g.kde.networkmanagement.interfaceconnection.xml |    9 +
 .../networkinterfaceactivatableprovider.cpp        |    6 +-
 libs/service/notificationmanager.cpp               |  619 ++++++----
 libs/service/notificationmanager.h                 |   56 +-
 libs/service/sessionabstractedservice.cpp          |    3 +-
 libs/service/sortedactivatablelist.cpp             |    7 +-
 libs/service/vpninterfaceconnectionprovider.cpp    |    2 +-
 .../wirednetworkinterfaceactivatableprovider.cpp   |    2 +-
 .../wirednetworkinterfaceactivatableprovider.h     |    2 +-
 ...wirelessnetworkinterfaceactivatableprovider.cpp |    4 +-
 .../wirelessnetworkinterfaceactivatableprovider.h  |    2 +-
 libs/ui/802_11_wirelesswidget.cpp                  |   62 +-
 libs/ui/802_11_wirelesswidget.h                    |   17 +-
 libs/ui/CMakeLists.txt                             |    4 +-
 libs/ui/cdmaconnectioneditor.cpp                   |   14 +-
 libs/ui/cdmaconnectioneditor.h                     |    2 +-
 libs/ui/cdmawidget.cpp                             |   15 +-
 libs/ui/cdmawidget.h                               |   11 +-
 libs/ui/connectioneditor.cpp                       |   22 +-
 libs/ui/connectionprefs.cpp                        |   52 +-
 libs/ui/connectionprefs.h                          |   30 +-
 libs/ui/connectionsecretsjob.cpp                   |   21 +-
 libs/ui/connectionwidget.cpp                       |   34 +-
 libs/ui/connectionwidget.h                         |   16 +-
 libs/ui/editlistdialog.cpp                         |    2 +-
 libs/ui/gsmconnectioneditor.cpp                    |   13 +-
 libs/ui/gsmconnectioneditor.h                      |    2 +-
 libs/ui/gsmwidget.cpp                              |   18 +-
 libs/ui/gsmwidget.h                                |   11 +-
 libs/ui/ipv4.ui                                    |  533 +++++----
 libs/ui/ipv4advancedwidget.cpp                     |    2 +-
 libs/ui/ipv4widget.cpp                             |   99 +-
 libs/ui/ipv4widget.h                               |   16 +-
 libs/ui/networkmanagement_vpnuiplugin.desktop      |   28 +-
 libs/ui/pppoepreferences.cpp                       |   13 +-
 libs/ui/pppoepreferences.h                         |    2 +-
 libs/ui/pppoewidget.cpp                            |   16 +-
 libs/ui/pppoewidget.h                              |   11 +-
 libs/ui/pppwidget.cpp                              |   14 +-
 libs/ui/pppwidget.h                                |   13 +-
 libs/ui/security/peapwidget.cpp                    |    2 +-
 libs/ui/security/peapwidget.h                      |    2 +-
 libs/ui/security/securitywired8021x.cpp            |    4 +
 libs/ui/security/securitywired8021x.h              |    2 +
 libs/ui/security/tlswidget.cpp                     |    6 +-
 libs/ui/security/ttlswidget.cpp                    |    2 +-
 libs/ui/security/ttlswidget.h                      |    2 +-
 libs/ui/security/wep.ui                            |    2 +-
 libs/ui/security/wepwidget.cpp                     |   38 +-
 libs/ui/security/wirelesssecuritysettingwidget.cpp |  157 ++-
 libs/ui/security/wirelesssecuritysettingwidget.h   |    6 +-
 libs/ui/settinginterface.cpp                       |   60 -
 libs/ui/settinginterface.h                         |   71 --
 libs/ui/settingwidget.cpp                          |   55 +-
 libs/ui/settingwidget.h                            |   42 +-
 .../settingwidget_p.h}                             |   16 +-
 libs/ui/simpleipv4addressvalidator.cpp             |    2 +-
 libs/ui/vpnpreferences.cpp                         |   19 +-
 libs/ui/vpnpreferences.h                           |    2 +-
 libs/ui/wiredpreferences.cpp                       |   12 +-
 libs/ui/wiredpreferences.h                         |    2 +-
 libs/ui/wiredwidget.cpp                            |   26 +-
 libs/ui/wiredwidget.h                              |   13 +-
 libs/ui/wirelesspreferences.cpp                    |   62 +-
 libs/ui/wirelesspreferences.h                      |   23 +-
 monolithic/CMakeLists.txt                          |   13 +-
 monolithic/connectioninfodialog.cpp                |  122 ++
 monolithic/connectioninfodialog.h                  |   58 +
 monolithic/connectioninfoipv4tab.cpp               |   88 ++
 .../connectioninfoipv4tab.h                        |   39 +-
 monolithic/connectioninfowidget.ui                 |   86 ++
 monolithic/connectioninfowiredtab.cpp              |   46 +
 .../connectioninfowiredtab.h                       |   41 +-
 monolithic/connectioninfowirelesstab.cpp           |  162 +++
 monolithic/connectioninfowirelesstab.h             |   68 ++
 monolithic/icons/network-wired-activated.svg       |  420 +++++++
 .../icons/ox128-device-network-wired-activated.png |  Bin 0 -> 5364 bytes
 .../icons/ox128-device-network-wireless-0.png      |  Bin 0 -> 21909 bytes
 .../icons/ox128-device-network-wireless-100.png    |  Bin 0 -> 19827 bytes
 .../icons/ox128-device-network-wireless-25.png     |  Bin 0 -> 21991 bytes
 .../icons/ox128-device-network-wireless-50.png     |  Bin 0 -> 21088 bytes
 .../icons/ox128-device-network-wireless-75.png     |  Bin 0 -> 20037 bytes
 .../icons/ox16-device-network-wired-activated.png  |  Bin 0 -> 701 bytes
 .../icons/ox16-device-network-wireless-0.png       |  Bin 0 -> 974 bytes
 .../icons/ox16-device-network-wireless-100.png     |  Bin 0 -> 906 bytes
 .../icons/ox16-device-network-wireless-25.png      |  Bin 0 -> 961 bytes
 .../icons/ox16-device-network-wireless-50.png      |  Bin 0 -> 941 bytes
 .../icons/ox16-device-network-wireless-75.png      |  Bin 0 -> 926 bytes
 .../icons/ox22-device-network-wired-activated.png  |  Bin 0 -> 993 bytes
 .../icons/ox22-device-network-wireless-0.png       |  Bin 0 -> 1573 bytes
 .../icons/ox22-device-network-wireless-00.png      |  Bin 1331 -> 0 bytes
 .../icons/ox22-device-network-wireless-100.png     |  Bin 1293 -> 1488 bytes
 .../icons/ox22-device-network-wireless-25.png      |  Bin 1349 -> 1551 bytes
 .../icons/ox22-device-network-wireless-50.png      |  Bin 1350 -> 1529 bytes
 .../icons/ox22-device-network-wireless-75.png      |  Bin 1352 -> 1505 bytes
 .../icons/ox32-device-network-wired-activated.png  |  Bin 0 -> 1541 bytes
 .../icons/ox32-device-network-wireless-0.png       |  Bin 0 -> 3210 bytes
 .../icons/ox32-device-network-wireless-100.png     |  Bin 0 -> 2986 bytes
 .../icons/ox32-device-network-wireless-25.png      |  Bin 0 -> 3155 bytes
 .../icons/ox32-device-network-wireless-50.png      |  Bin 0 -> 3111 bytes
 .../icons/ox32-device-network-wireless-75.png      |  Bin 0 -> 3050 bytes
 .../icons/ox48-device-network-wired-activated.png  |  Bin 0 -> 2366 bytes
 .../icons/ox48-device-network-wireless-0.png       |  Bin 0 -> 6158 bytes
 .../icons/ox48-device-network-wireless-100.png     |  Bin 0 -> 5503 bytes
 .../icons/ox48-device-network-wireless-25.png      |  Bin 0 -> 6051 bytes
 .../icons/ox48-device-network-wireless-50.png      |  Bin 0 -> 5859 bytes
 .../icons/ox48-device-network-wireless-75.png      |  Bin 0 -> 5681 bytes
 .../icons/ox64-device-network-wired-activated.png  |  Bin 0 -> 3200 bytes
 .../icons/ox64-device-network-wireless-0.png       |  Bin 0 -> 8941 bytes
 .../icons/ox64-device-network-wireless-100.png     |  Bin 0 -> 7968 bytes
 .../icons/ox64-device-network-wireless-25.png      |  Bin 0 -> 8841 bytes
 .../icons/ox64-device-network-wireless-50.png      |  Bin 0 -> 8492 bytes
 .../icons/ox64-device-network-wireless-75.png      |  Bin 0 -> 8161 bytes
 monolithic/interfaceconnectionitem.cpp             |   25 +-
 monolithic/kde4-knetworkmanager-autostart.desktop  |   45 +-
 monolithic/knetworkmanager.desktop                 |   45 +-
 monolithic/knetworkmanagertrayicon.cpp             |  131 +--
 monolithic/knetworkmanagertrayicon.h               |   17 +-
 monolithic/monolithic.cpp                          |   30 +-
 monolithic/otherwirelessnetworkdialog.cpp          |   89 +-
 monolithic/otherwirelessnetworkdialog.h            |    8 +-
 monolithic/otherwirelessnetworkwidget.ui           |   30 +-
 monolithic/tooltipbuilder.cpp                      |  145 +---
 monolithic/unconfiguredinterfaceitem.cpp           |   23 +-
 networkmanagement.notifyrc                         |  540 +--------
 settings/CMakeLists.txt                            |    1 -
 settings/config/kcm_networkmanagement.desktop      |   33 +-
 settings/config/kcm_networkmanagement_tray.desktop |   19 +-
 settings/config/manageconnectionwidget.cpp         |    4 +-
 settings/config/menutooltipsettingswidget.cpp      |    4 +-
 settings/config/traysettings.ui                    |   54 +-
 settings/config/traysettingswidget.cpp             |    2 +
 settings/ip4config.cpp                             |   68 --
 settings/ip4config.h                               |   50 -
 settings/service/CMakeLists.txt                    |   30 -
 settings/service/Messages.sh                       |    3 -
 settings/service/datamappings.cpp                  |  134 ---
 settings/service/datamappings.h                    |   41 -
 settings/service/knetworkmanager.desktop           |   57 -
 settings/service/org.kde.networkmanagement.xml     |   11 -
 .../wirelessnetworkinterfaceenvironment.cpp        |    2 +-
 .../wirelessnetworkinterfaceenvironment.h          |    4 +-
 tools/delete-config                                |   13 +
 tools/list-connections                             |   15 +
 load-module.sh => tools/load-module.sh             |    0
 unload-module.sh => tools/unload-module.sh         |    0
 vpnplugins/CMakeLists.txt                          |    1 +
 vpnplugins/novellvpn/CMakeLists.txt                |   19 +
 .../networkmanagement_novellvpnui.desktop          |   34 +
 vpnplugins/novellvpn/nm-novellvpn-service.h        |   83 ++
 .../{pptp/pptp.cpp => novellvpn/novellvpn.cpp}     |   19 +-
 vpnplugins/{pptp/pptp.h => novellvpn/novellvpn.h}  |   12 +-
 vpnplugins/novellvpn/novellvpnadvancedprop.ui      |   84 ++
 vpnplugins/novellvpn/novellvpnprop.ui              |  253 ++++
 vpnplugins/novellvpn/novellvpnwidget.cpp           |  214 ++++
 .../pptpwidget.h => novellvpn/novellvpnwidget.h}   |   32 +-
 .../openvpn/networkmanagement_openvpnui.desktop    |   43 +-
 vpnplugins/openvpn/openvpnprop.ui                  |    2 +-
 vpnplugins/openvpn/openvpnwidget.cpp               |   35 +-
 vpnplugins/openvpn/openvpnwidget.h                 |    2 +
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |   28 +-
 vpnplugins/pptp/pptpadvanced.ui                    |    4 +-
 vpnplugins/pptp/pptpwidget.cpp                     |    7 +-
 vpnplugins/pptp/pptpwidget.h                       |    1 +
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |   40 +-
 vpnplugins/vpnc/vpncprop.ui                        |    2 +-
 vpnplugins/vpnc/vpncwidget.cpp                     |    4 +
 vpnplugins/vpnc/vpncwidget.h                       |    1 +
 252 files changed, 6704 insertions(+), 4776 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list