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

Modestas Vainius modax-guest at alioth.debian.org
Thu Oct 1 23:28:49 UTC 2009


The following commit has been merged in the master branch:
commit 0d2875522a3e044798076e8eb421fdc58fb30ea7
Merge: 6f9c5aa23ebeb9467438aa136b8e74c06628f904 e9bc305242af47243d83237a7ac9953e6cefefa9
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Oct 1 16:35:01 2009 +0300

    Merge branch 'upstream'

 CMakeLists.txt                                     |    7 +-
 Messages.sh                                        |    5 +
 README                                             |    5 +
 applet/interfaceitem.cpp                           |   17 +-
 applet/networkmanager.cpp                          |   10 +-
 applet/plasma-applet-networkmanagement.desktop     |   20 +-
 backends/CMakeLists.txt                            |    4 +
 backends/NetworkManager/connectiondbus.cpp         |    6 +-
 .../nmdbusactiveconnectionmonitor.cpp              |    3 +-
 .../nmdbussettingsconnectionprovider.cpp           |   26 +-
 .../nmdbussettingsconnectionprovider.h             |   26 +-
 backends/NetworkManager/nmdbussettingsservice.cpp  |  142 +--
 backends/NetworkManager/nmdbussettingsservice.h    |   30 +-
 backends/NetworkManager/remoteconnection.cpp       |   26 +-
 backends/NetworkManager/remoteconnection.h         |   26 +-
 backends/NetworkManager/settings/gsmdbus.cpp       |    9 +-
 backends/NetworkManager/settings/pppdbus.cpp       |   53 +-
 backends/NetworkManager/settings/pppdbus.h         |    3 +
 backends/NetworkManager/settings/serialdbus.cpp    |   22 +-
 backends/NetworkManager/settings/serialdbus.h      |    3 +
 backends/NetworkManager/settings/vpndbus.cpp       |    6 +-
 backends/wicd/CMakeLists.txt                       |   27 +
 backends/wicd/wicdconnectionhandler.cpp            |   55 ++
 backends/wicd/wicdconnectionhandler.h              |   40 +
 kded/networkmanagement.desktop                     |   24 +-
 libs/Messages.sh                                   |    5 -
 libs/internals/CMakeLists.txt                      |    1 +
 libs/internals/activatable.cpp                     |   26 +-
 libs/internals/activatable.h                       |   27 +-
 ...n.cpp => hiddenwirelessinterfaceconnection.cpp} |   11 +-
 .../internals/hiddenwirelessinterfaceconnection.h  |   29 +-
 libs/internals/interfaceconnection.cpp             |   26 +-
 libs/internals/interfaceconnection.h               |   24 +-
 libs/internals/kconfig_compiler.cpp                |    1 +
 libs/internals/schemas/vpn.kcfg                    |    2 +-
 libs/internals/secretstoragehelper.cpp             |   26 +-
 libs/internals/secretstoragehelper.h               |   26 +-
 libs/internals/setting.cpp                         |   12 +-
 libs/internals/setting.h                           |    4 +
 .../settings/802-11-wireless-security.cpp          |   20 +
 libs/internals/settings/802-11-wireless-security.h |    2 +
 .../802-11-wireless-securitypersistence.cpp        |    3 +-
 .../settings/802-11-wirelesspersistence.cpp        |    1 +
 libs/internals/settings/802-1xpersistence.cpp      |    1 +
 .../settings/802-3-ethernetpersistence.cpp         |    1 +
 libs/internals/settings/cdmapersistence.cpp        |    1 +
 libs/internals/settings/gsm.cpp                    |    2 +-
 libs/internals/settings/gsm.h                      |    4 +-
 libs/internals/settings/gsmpersistence.cpp         |    1 +
 libs/internals/settings/ipv4persistence.cpp        |    8 +-
 libs/internals/settings/pppoepersistence.cpp       |    1 +
 libs/internals/settings/ppppersistence.cpp         |    1 +
 libs/internals/settings/serialpersistence.cpp      |    1 +
 libs/internals/settings/vpnpersistence.cpp         |    6 +-
 libs/internals/settings_hand_edits.diff            | 1009 ++------------------
 libs/internals/wirelessinterfaceconnection.cpp     |   26 +-
 libs/internals/wirelessinterfaceconnection.h       |   36 +-
 .../wirelessinterfaceconnectionhelpers.cpp         |   40 +-
 .../internals/wirelessinterfaceconnectionhelpers.h |   19 +-
 .../wirelessinterfaceconnectionhelpers_p.h         |   18 +
 libs/internals/wirelessnetwork.cpp                 |   26 +-
 libs/internals/wirelessnetwork.h                   |   24 +-
 libs/internals/wpasecretidentifier.cpp             |    4 +-
 libs/service/activatabledebug.cpp                  |    5 +
 libs/service/connectionlistpersistence.cpp         |   26 +-
 libs/service/connectionlistpersistence.h           |   26 +-
 libs/service/events.cpp                            |   24 +-
 libs/service/events.h                              |   27 +-
 .../networkinterfaceactivatableprovider.cpp        |   22 +-
 .../networkinterfaceactivatableprovider_p.h        |    4 +-
 libs/service/notificationmanager.cpp               |   83 +-
 libs/service/sortedactivatablelist.cpp             |   24 +-
 libs/service/sortedactivatablelist.h               |   24 +-
 .../wirednetworkinterfaceactivatableprovider.cpp   |    4 +-
 ...wirelessnetworkinterfaceactivatableprovider.cpp |  226 +++--
 libs/ui/802-11-wireless.ui                         |   48 +-
 libs/ui/802_11_wirelesswidget.cpp                  |   41 +-
 libs/ui/CMakeLists.txt                             |    8 +-
 libs/ui/accesspoint.cpp                            |   29 +-
 libs/ui/accesspoint.h                              |   35 +-
 libs/ui/apitemdelegate.cpp                         |   29 +-
 libs/ui/apitemdelegate.h                           |   35 +-
 libs/ui/apitemmodel.cpp                            |   35 +-
 libs/ui/apitemmodel.h                              |   35 +-
 libs/ui/apitemview.cpp                             |   35 +-
 libs/ui/apitemview.h                               |   35 +-
 libs/ui/connectioneditor.cpp                       |    4 +-
 libs/ui/connectionsecretsjob.cpp                   |   10 +-
 libs/ui/editlistdialog.cpp                         |   94 ++
 .../{security/wpapskwidget.h => editlistdialog.h}  |   36 +-
 libs/ui/gsm.ui                                     |    4 +-
 libs/ui/gsmwidget.cpp                              |    5 +
 libs/ui/ifaceitemmodel.cpp                         |   35 +-
 libs/ui/ifaceitemmodel.h                           |   35 +-
 libs/ui/ipv4.ui                                    |  387 +++++---
 libs/ui/ipv4advanced.ui                            |  145 +++
 libs/ui/ipv4advancedwidget.cpp                     |  218 +++++
 libs/ui/{ipv4widget.h => ipv4advancedwidget.h}     |   69 +-
 libs/ui/ipv4widget.cpp                             |  431 +++++----
 libs/ui/ipv4widget.h                               |   55 +-
 libs/ui/listvalidator.cpp                          |   80 ++
 libs/ui/{security/wepwidget.h => listvalidator.h}  |   43 +-
 libs/ui/networkmanagement_vpnuiplugin.desktop      |   18 +
 libs/ui/ppp.ui                                     |  102 ++-
 libs/ui/pppoepreferences.cpp                       |    2 +-
 libs/ui/pppoepreferences.h                         |    1 +
 libs/ui/pppwidget.cpp                              |   12 +-
 libs/ui/scanwidget.cpp                             |   35 +-
 libs/ui/scanwidget.h                               |   35 +-
 libs/ui/security/wirelesssecuritysettingwidget.cpp |   39 +-
 libs/ui/security/wirelesssecuritysettingwidget.h   |    3 +-
 libs/ui/simpleipv4addressvalidator.cpp             |   99 ++
 ...spreferences.h => simpleipv4addressvalidator.h} |   36 +-
 libs/ui/vpnpreferences.cpp                         |    1 +
 libs/ui/wired.ui                                   |   47 +-
 libs/ui/wiredwidget.cpp                            |   44 +-
 monolithic/CMakeLists.txt                          |   12 +-
 monolithic/activatableitem.cpp                     |    2 -
 monolithic/interfaceconnectionitem_p.h             |   26 +-
 monolithic/kde4-knetworkmanager-autostart.desktop  |   40 +-
 monolithic/knetworkmanager.desktop                 |   40 +-
 monolithic/knetworkmanagertrayicon.cpp             |  124 ++--
 monolithic/knetworkmanagertrayicon.h               |   17 +-
 monolithic/main.cpp                                |    8 +-
 monolithic/monolithic.cpp                          |   37 +-
 monolithic/otherwirelessnetworkdialog.cpp          |  153 +++
 .../otherwirelessnetworkdialog.h                   |   43 +-
 .../otherwirelessnetworkwidget.ui                  |   30 +-
 monolithic/unconfiguredinterfaceitem.cpp           |   12 +-
 monolithic/wirelessstatus.cpp                      |    3 +-
 networkmanagement.notifyrc                         |  292 +++++-
 settings/config/CMakeLists.txt                     |   19 +-
 settings/config/Messages.sh                        |    4 -
 settings/config/kcm_networkmanagement.desktop      |   75 +-
 settings/config/kcm_networkmanagement_tray.desktop |   35 +
 settings/config/manageconnectionwidget.cpp         |   53 +-
 settings/config/manageconnectionwidget.h           |   32 +-
 settings/config/managetraywidget.cpp               |  112 +++
 .../config/managetraywidget.h                      |   34 +-
 settings/config/menutooltipsettingswidget.cpp      |   26 +-
 settings/config/menutooltipsettingswidget.h        |   26 +-
 settings/config/storage.ui                         |   63 ++
 settings/config/traysettings.ui                    |   48 +-
 settings/config/traysettingswidget.cpp             |   26 +-
 settings/config/traysettingswidget.h               |   26 +-
 settings/service/knetworkmanager.desktop           |   20 +-
 vpnplugins/openvpn/Messages.sh                     |    3 -
 .../openvpn/networkmanagement_openvpnui.desktop    |   32 +
 vpnplugins/openvpn/openvpn.cpp                     |    2 +-
 vpnplugins/openvpn/openvpnwidget.cpp               |   24 +-
 vpnplugins/pptp/Messages.sh                        |    3 -
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |   27 +-
 vpnplugins/pptp/pptp.cpp                           |    2 +-
 vpnplugins/pptp/pptpadvanced.ui                    |  166 ++--
 vpnplugins/pptp/pptpprop.ui                        |   35 +-
 vpnplugins/pptp/pptpwidget.cpp                     |  102 ++-
 vpnplugins/pptp/pptpwidget.h                       |    1 +
 vpnplugins/vpnc/Messages.sh                        |    3 -
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |   33 +
 vpnplugins/vpnc/vpnc.cpp                           |    2 +-
 vpnplugins/vpnc/vpncwidget.cpp                     |    5 +-
 161 files changed, 4106 insertions(+), 2827 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list