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

Modestas Vainius modax at alioth.debian.org
Fri Apr 22 21:23:02 UTC 2011


The following commit has been merged in the master branch:
commit 41eb8e5cf6a46327b009a8a51ccda4151ae0f8c0
Merge: 2aa2c6440c91caee7c484c93bccd27f8e69d41ab 372fb9c523a143685fbce442d0e26fd8b4521db2
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Apr 22 22:23:16 2011 +0300

    Merge branch 'upstream'

 CMakeLists.txt                                     |    4 +-
 applet/CMakeLists.txt                              |    6 +-
 applet/activatableitem.cpp                         |    9 +-
 applet/activatableitem.h                           |    3 +-
 applet/activatablelistwidget.cpp                   |   22 +-
 applet/activatablelistwidget.h                     |    2 +-
 applet/gsminterfaceconnectionitem.cpp              |    5 -
 applet/hiddenwirelessnetworkitem.cpp               |    4 -
 applet/interfaceconnectionitem.cpp                 |    5 -
 applet/interfacedetailswidget.cpp                  |   63 ++-
 applet/interfacedetailswidget.h                    |    1 +
 applet/interfaceitem.cpp                           |   15 +-
 applet/networkmanager.cpp                          |   20 +-
 applet/networkmanager.h                            |    2 +
 applet/nmpopup.cpp                                 |   24 +-
 applet/plasma-applet-networkmanagement.desktop     |    4 +-
 applet/vpninterfaceitem.cpp                        |   10 +-
 applet/wirelessnetworkitem.cpp                     |   28 +-
 backends/NetworkManager/CMakeLists.txt             |    1 +
 backends/NetworkManager/connectiondbus.cpp         |   55 +++-
 backends/NetworkManager/connectiondbus.h           |    1 +
 backends/NetworkManager/generateDbusAdapters.sh    |   10 +-
 .../nm-exported-connection-secrets-interface.cpp   |   26 ++
 .../nm-exported-connection-secrets-interface.h     |   50 +++
 .../nmdbussettingsconnectionprovider.cpp           |  223 +++++++++-
 .../nmdbussettingsconnectionprovider.h             |   14 +
 backends/NetworkManager/nmdbussettingsservice.cpp  |    8 +
 .../settings/802-11-wireless-securitydbus.cpp      |  157 ++++++--
 .../settings/802-11-wirelessdbus.cpp               |   11 +-
 backends/NetworkManager/settings/802-1xdbus.cpp    |   15 +-
 .../NetworkManager/settings/802-3-ethernetdbus.cpp |    4 +-
 backends/NetworkManager/settings/gsmdbus.cpp       |   14 +-
 backends/NetworkManager/settings/ipv4dbus.cpp      |   50 ++-
 backends/NetworkManager/settings/pppoedbus.cpp     |    9 +-
 dataengine/networkmanagementengine.cpp             |   13 +-
 dataengine/plasma-engine-networkmanagement.desktop |   25 ++
 kded/networkmanagement.desktop                     |    2 +
 kded/service.cpp                                   |   12 +-
 libs/CMakeLists.txt                                |    3 +
 libs/client/remoteactivatablelist.cpp              |    9 +-
 {monolithic => libs}/icons/CMakeLists.txt          |    0
 .../icons/network-wired-activated.svg              |    0
 .../icons/ox128-device-network-wired-activated.png |  Bin 4247 -> 4247 bytes
 .../icons/ox128-device-network-wireless-0.png      |  Bin 17829 -> 17829 bytes
 .../icons/ox128-device-network-wireless-100.png    |  Bin 15507 -> 15507 bytes
 .../icons/ox128-device-network-wireless-25.png     |  Bin 17836 -> 17836 bytes
 .../icons/ox128-device-network-wireless-50.png     |  Bin 16897 -> 16897 bytes
 .../icons/ox128-device-network-wireless-75.png     |  Bin 15811 -> 15811 bytes
 .../icons/ox16-device-network-wired-activated.png  |  Bin 654 -> 654 bytes
 .../icons/ox16-device-network-wireless-0.png       |  Bin 973 -> 973 bytes
 .../icons/ox16-device-network-wireless-100.png     |  Bin 896 -> 896 bytes
 .../icons/ox16-device-network-wireless-25.png      |  Bin 960 -> 960 bytes
 .../icons/ox16-device-network-wireless-50.png      |  Bin 941 -> 941 bytes
 .../icons/ox16-device-network-wireless-75.png      |  Bin 920 -> 920 bytes
 .../icons/ox22-device-network-wired-activated.png  |  Bin 916 -> 916 bytes
 .../icons/ox22-device-network-wireless-0.png       |  Bin 1564 -> 1564 bytes
 .../icons/ox22-device-network-wireless-100.png     |  Bin 1476 -> 1476 bytes
 .../icons/ox22-device-network-wireless-25.png      |  Bin 1541 -> 1541 bytes
 .../icons/ox22-device-network-wireless-50.png      |  Bin 1520 -> 1520 bytes
 .../icons/ox22-device-network-wireless-75.png      |  Bin 1498 -> 1498 bytes
 .../icons/ox32-device-network-wired-activated.png  |  Bin 1436 -> 1436 bytes
 .../icons/ox32-device-network-wireless-0.png       |  Bin 2708 -> 2708 bytes
 .../icons/ox32-device-network-wireless-100.png     |  Bin 2493 -> 2493 bytes
 .../icons/ox32-device-network-wireless-25.png      |  Bin 2662 -> 2662 bytes
 .../icons/ox32-device-network-wireless-50.png      |  Bin 2609 -> 2609 bytes
 .../icons/ox32-device-network-wireless-75.png      |  Bin 2554 -> 2554 bytes
 .../icons/ox48-device-network-wired-activated.png  |  Bin 1780 -> 1780 bytes
 .../icons/ox48-device-network-wireless-0.png       |  Bin 5028 -> 5028 bytes
 .../icons/ox48-device-network-wireless-100.png     |  Bin 4435 -> 4435 bytes
 .../icons/ox48-device-network-wireless-25.png      |  Bin 4926 -> 4926 bytes
 .../icons/ox48-device-network-wireless-50.png      |  Bin 4754 -> 4754 bytes
 .../icons/ox48-device-network-wireless-75.png      |  Bin 4587 -> 4587 bytes
 .../icons/ox64-device-network-wired-activated.png  |  Bin 2329 -> 2329 bytes
 .../icons/ox64-device-network-wireless-0.png       |  Bin 7278 -> 7278 bytes
 .../icons/ox64-device-network-wireless-100.png     |  Bin 6242 -> 6242 bytes
 .../icons/ox64-device-network-wireless-25.png      |  Bin 7188 -> 7188 bytes
 .../icons/ox64-device-network-wireless-50.png      |  Bin 6821 -> 6821 bytes
 .../icons/ox64-device-network-wireless-75.png      |  Bin 6444 -> 6444 bytes
 libs/internals/connection.cpp                      |   64 +++-
 libs/internals/connection.h                        |   16 +-
 libs/internals/connectionpersistence.cpp           |    4 +-
 libs/internals/kconfig_compiler.cpp                |    8 +-
 .../settings/802-11-wireless-security.cpp          |    5 +-
 libs/internals/settings/802-11-wireless-security.h |   30 ++
 .../802-11-wireless-securitypersistence.cpp        |    6 +
 libs/internals/settings/802-11-wireless.h          |   27 ++
 .../settings/802-11-wirelesspersistence.cpp        |   12 +-
 libs/internals/settings/802-1x.cpp                 |    2 +-
 libs/internals/settings/802-1x.h                   |    2 +-
 libs/internals/settings/802-3-ethernet.h           |   28 ++
 .../settings/802-3-ethernetpersistence.cpp         |    4 +-
 libs/internals/settings/gsm.h                      |   17 -
 libs/internals/settings/gsmpersistence.cpp         |   14 +-
 libs/internals/uiutils.cpp                         |   43 +-
 libs/internals/uiutils.h                           |   11 +-
 .../wirelessinterfaceconnectionhelpers.cpp         |   31 ++-
 libs/service/configurationlauncher.cpp             |    5 +-
 libs/service/connectionlistpersistence.cpp         |    4 +-
 libs/service/networkinterfacemonitor.cpp           |   26 ++
 libs/service/notificationmanager.cpp               |   47 ++-
 ...wirelessnetworkinterfaceactivatableprovider.cpp |   57 +++-
 .../wirelessnetworkinterfaceactivatableprovider.h  |    1 +
 libs/ui/802-11-wireless.ui                         |   81 ++++-
 libs/ui/802_11_wirelesswidget.cpp                  |  115 +++++-
 libs/ui/802_11_wirelesswidget.h                    |   19 +
 libs/ui/cdmaconnectioneditor.cpp                   |   35 ++
 libs/ui/cdmaconnectioneditor.h                     |    6 +
 libs/ui/connection.ui                              |    2 +-
 libs/ui/connectioneditor.cpp                       |   90 ++++-
 libs/ui/connectioneditor.h                         |   19 +-
 libs/ui/connectionprefs.cpp                        |   17 +-
 libs/ui/connectionprefs.h                          |    2 +-
 libs/ui/connectionsecretsjob.cpp                   |    4 +-
 libs/ui/connectionwidget.cpp                       |    7 +-
 libs/ui/gsm.ui                                     |   52 +--
 libs/ui/gsmconnectioneditor.cpp                    |   54 +++-
 libs/ui/gsmconnectioneditor.h                      |    6 +
 libs/ui/gsmwidget.cpp                              |    6 +-
 libs/ui/ipv4.ui                                    |    4 +-
 libs/ui/ipv4widget.cpp                             |   90 +++-
 libs/ui/networkmanagement_vpnuiplugin.desktop      |    5 +
 libs/ui/pppoepreferences.cpp                       |   32 ++-
 libs/ui/pppoepreferences.h                         |    9 +
 libs/ui/scanwidget.cpp                             |    8 +-
 libs/ui/security/eapmethodleapbase.ui              |    2 +-
 libs/ui/security/eapmethodpeapbase.ui              |    2 +-
 libs/ui/security/eapmethodsimple.cpp               |    3 +
 libs/ui/security/eapmethodsimple.h                 |    2 +-
 libs/ui/security/eapmethodstack.cpp                |    2 +-
 libs/ui/security/eapmethodstack.h                  |    2 +-
 libs/ui/security/eapmethodttlsbase.ui              |    2 +-
 libs/ui/security/nullsecuritywidget.cpp            |    2 +-
 libs/ui/security/nullsecuritywidget.h              |    2 +-
 libs/ui/security/peapwidget.cpp                    |    4 +-
 libs/ui/security/securityeap.cpp                   |    2 +-
 libs/ui/security/securityeap.h                     |    2 +-
 libs/ui/security/securityleap.cpp                  |    2 +-
 libs/ui/security/securityleap.h                    |    2 +-
 libs/ui/security/securitywidget.cpp                |   18 +
 libs/ui/security/securitywidget.h                  |    6 +-
 libs/ui/security/securitywidget_p.h                |    5 +
 libs/ui/security/securitywired8021x.cpp            |    2 -
 libs/ui/security/wepwidget.cpp                     |   41 ++-
 libs/ui/security/wepwidget.h                       |    3 +-
 libs/ui/security/wirelesssecuritysettingwidget.cpp |   34 ++-
 libs/ui/security/wpapskwidget.cpp                  |   16 +-
 libs/ui/security/wpapskwidget.h                    |    3 +-
 libs/ui/vpnpreferences.cpp                         |   47 ++-
 libs/ui/vpnpreferences.h                           |    6 +
 libs/ui/wiredpreferences.cpp                       |   34 ++-
 libs/ui/wiredpreferences.h                         |    9 +
 libs/ui/wiredwidget.cpp                            |   11 +-
 libs/ui/wirelesspreferences.cpp                    |   70 +++
 libs/ui/wirelesspreferences.h                      |    6 +
 monolithic/CMakeLists.txt                          |    2 +-
 monolithic/connectioninfodialog.cpp                |    1 +
 monolithic/{icons => icon}/CMakeLists.txt          |    0
 .../{icons => icon}/hi32-app-knetworkmanager.png   |  Bin 1802 -> 1802 bytes
 monolithic/interfaceconnectionitem.cpp             |    3 +-
 monolithic/interfaceconnectionitem.h               |    3 +
 monolithic/kde4-knetworkmanager-autostart.desktop  |    3 +
 monolithic/knetworkmanager.desktop                 |    3 +
 monolithic/knetworkmanagertrayicon.cpp             |   29 +-
 monolithic/knetworkmanagertrayicon.h               |    7 +
 monolithic/monolithic.cpp                          |    1 -
 monolithic/otherwirelessnetworkdialog.cpp          |   42 ++
 monolithic/otherwirelessnetworkdialog.h            |    2 +
 monolithic/tooltipbuilder.cpp                      |    2 +-
 monolithic/wirelessstatus.cpp                      |    2 +-
 networkmanagement.notifyrc                         |   29 ++
 qml/package/contents/code/main.qml                 |  110 +++--
 qml/package/metadata.desktop                       |   10 +-
 qml/plasma-applet-networkconnections.desktop       |    5 +
 settings/config/CMakeLists.txt                     |    8 +-
 settings/config/kcm_networkmanagement.desktop      |    2 +
 settings/config/kcm_networkmanagement_tray.desktop |    2 +
 settings/config/manageconnectionwidget.cpp         |  457 +++++++++++++++++---
 settings/config/manageconnectionwidget.h           |   42 ++-
 settings/config/manageconnectionwidget.ui          |   25 ++
 settings/config/managetraywidget.cpp               |    2 +-
 settings/config/mobileconnectionwizard.cpp         |    4 +-
 settings/config/mobileconnectionwizard.h           |    4 +-
 settings/config/mobileproviders.cpp                |   21 +-
 settings/configshell/CMakeLists.txt                |   10 +-
 settings/configshell/main.cpp                      |   28 ++-
 .../networkmanagement_novellvpnui.desktop          |    4 +-
 .../openvpn/networkmanagement_openvpnui.desktop    |    4 +-
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |    4 +-
 .../networkmanagement_strongswanui.desktop         |    4 +-
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |    4 +-
 vpnplugins/vpnc/vpncauth.cpp                       |    7 +-
 191 files changed, 2730 insertions(+), 564 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list