[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. master/0.1-svn1007929-1-6-g6f9c5aa

Modestas Vainius modax-guest at alioth.debian.org
Fri Aug 21 20:56:01 UTC 2009


The following commit has been merged in the master branch:
commit bed0d3541543723296252cf3f9370fe23288b5b5
Merge: 6cea2dfa6d5eedb058e2079a9ae101ef53c0b020 28977ab8b7375aca0060b0e68b1e1f60633b1595
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Aug 21 22:25:16 2009 +0300

    Merge branch 'upstream'

 applet/CMakeLists.txt                              |   18 +-
 applet/Messages.sh                                 |    2 +-
 applet/activatableitem.cpp                         |    3 +-
 applet/activatableitem.h                           |    4 +-
 applet/activatablelistwidget.cpp                   |    4 +-
 applet/activatablelistwidget.h                     |    2 +-
 applet/deprecated/connectionlist.cpp               |  164 -------
 applet/deprecated/connectionlist.h                 |   93 ----
 applet/deprecated/generalextender.cpp              |  133 -----
 applet/deprecated/generalextender.h                |   59 ---
 applet/deprecated/interfacegroup.cpp               |  503 --------------------
 applet/deprecated/interfacegroup.h                 |   89 ----
 .../deprecated/wirelessinterfaceconnectionitem.cpp |  185 -------
 .../deprecated/wirelessinterfaceconnectionitem.h   |   66 ---
 applet/events.cpp                                  |   33 --
 applet/events.h                                    |   41 --
 applet/interfaceconnectionitem.cpp                 |    6 +-
 applet/interfaceitem.cpp                           |   89 ++--
 applet/interfaceitem.h                             |   13 +-
 applet/nmextenderitem.cpp                          |    1 +
 applet/serialinterfaceitem.cpp                     |  151 ------
 applet/serialinterfaceitem.h                       |   63 ---
 applet/vpnconnectiongroup.cpp                      |  118 -----
 applet/vpnconnectiongroup.h                        |   51 --
 applet/wiredinterfaceitem.cpp                      |    9 -
 applet/wirelessinterfaceitem.cpp                   |   45 +--
 applet/wirelessnetworkitem.cpp                     |   76 ++--
 applet/wirelessnetworkitem.h                       |    2 +-
 backends/NetworkManager/CMakeLists.txt             |    6 +
 backends/NetworkManager/busconnection.cpp          |    1 -
 backends/NetworkManager/connectiondbus.cpp         |   10 +-
 backends/NetworkManager/exportedconnection.cpp     |   43 +--
 backends/NetworkManager/exportedconnection.h       |  119 +----
 .../NetworkManager/exportedconnectionsecrets.cpp   |   41 ++
 .../NetworkManager/exportedconnectionsecrets.h     |   61 +++
 .../introspection/nm-active-connection.xml         |    3 +
 .../introspection/nm-connection-secrets.xml        |   43 ++
 .../introspection/nm-exported-connection.xml       |   65 +++
 .../NetworkManager}/introspection/nm-settings.xml  |    0 
 .../nm-active-connectioninterface.cpp              |    8 +-
 .../NetworkManager/nm-active-connectioninterface.h |   20 +-
 .../nm-exported-connectioninterface.cpp            |    8 +-
 .../nm-exported-connectioninterface.h              |   32 +-
 backends/NetworkManager/nm-settingsinterface.cpp   |    8 +-
 backends/NetworkManager/nm-settingsinterface.h     |   19 +-
 backends/NetworkManager/nmdbussettingsservice.cpp  |    1 +
 backends/NetworkManager/pbkdf2.cpp                 |    3 +-
 backends/NetworkManager/remoteconnection.h         |    6 +-
 .../settings/802-11-wireless-securitydbus.cpp      |    5 +-
 backends/NetworkManager/settings/802-1xdbus.cpp    |   12 +-
 backends/NetworkManager/settings/ipv4dbus.cpp      |   72 ++--
 kded/networkmanagement.desktop                     |    1 +
 libs/client/remotewirelessinterfaceconnection.cpp  |   11 +-
 libs/client/remotewirelessinterfaceconnection.h    |    7 +-
 libs/client/remotewirelessnetwork.cpp              |   12 +-
 libs/client/remotewirelessnetwork.h                |    6 +-
 libs/client/remotewirelessobject.h                 |    3 +-
 libs/internals/CMakeLists.txt                      |   11 +-
 libs/internals/connection.cpp                      |   35 ++
 libs/internals/connection.h                        |    3 +
 libs/internals/connectionpersistence.cpp           |    2 +
 libs/internals/interfaceconnection.cpp             |   29 +-
 libs/internals/interfaceconnection.h               |   16 +-
 libs/internals/interfaceconnectionhelpers.cpp      |   87 ++++
 libs/internals/interfaceconnectionhelpers.h        |   53 ++
 libs/internals/interfaceconnectionhelpers_p.h      |   77 +++
 .../schemas/802-11-wireless-security.kcfg          |   12 +-
 libs/internals/schemas/802-1x.kcfg                 |   22 +-
 libs/internals/settings/802-11-wireless-security.h |    2 +-
 .../802-11-wireless-securitypersistence.cpp        |   56 ++-
 libs/internals/settings/802-1x.cpp                 |   12 +
 libs/internals/settings/802-1x.h                   |   90 +++-
 libs/internals/settings/802-1xpersistence.cpp      |    8 +
 libs/internals/settings_hand_edits.diff            |  367 +++++++++------
 libs/internals/tooltips.h                          |    2 +-
 libs/internals/vpninterfaceconnection.cpp          |    5 +-
 libs/internals/vpninterfaceconnection.h            |    8 +-
 libs/internals/vpninterfaceconnectionhelpers.cpp   |   86 ++++
 libs/internals/vpninterfaceconnectionhelpers.h     |   53 ++
 libs/internals/vpninterfaceconnectionhelpers_p.h   |   67 +++
 libs/internals/wirelessinterfaceconnection.cpp     |    4 +-
 libs/internals/wirelessinterfaceconnection.h       |    9 +-
 .../wirelessinterfaceconnectionhelpers.cpp         |  131 +++++
 .../internals/wirelessinterfaceconnectionhelpers.h |   60 +++
 .../wirelessinterfaceconnectionhelpers_p.h         |   76 +++
 libs/internals/wirelessnetwork.cpp                 |    4 +-
 libs/internals/wirelessnetwork.h                   |    2 +-
 libs/internals/wirelessobject.cpp                  |   17 +-
 libs/internals/wirelessobject.h                    |   12 +-
 libs/internals/wirelesssecurityidentifier.cpp      |  290 +++++++++++
 libs/internals/wirelesssecurityidentifier.h        |   49 ++
 libs/service/CMakeLists.txt                        |    2 +
 libs/service/configurationlauncher.cpp             |   43 +-
 libs/service/configurationlauncher.h               |    2 +-
 libs/service/connectionusagemonitor.cpp            |   70 ++--
 ...tworkmanagement.wirelessinterfaceconnection.xml |    9 +-
 .../org.kde.networkmanagement.wirelessnetwork.xml  |    7 +-
 .../networkinterfaceactivatableprovider.cpp        |   12 +-
 libs/service/vpninterfaceconnectionprovider.cpp    |   45 ++-
 libs/service/vpninterfaceconnectionprovider.h      |    4 +
 ...wirelessnetworkinterfaceactivatableprovider.cpp |   27 +-
 libs/ui/802-11-wireless.ui                         |   10 +-
 libs/ui/802_11_wirelesswidget.cpp                  |    3 +-
 libs/ui/CMakeLists.txt                             |   12 +-
 libs/ui/apitemdelegate.cpp                         |    1 -
 libs/ui/apitemmodel.cpp                            |    2 -
 libs/ui/apitemview.cpp                             |    2 -
 libs/ui/connection.ui                              |  140 ++++--
 libs/ui/connectioneditor.cpp                       |    4 +-
 libs/ui/connectionprefs.cpp                        |    2 +-
 libs/ui/connectionsecretsjob.cpp                   |    8 +-
 libs/ui/connectionwidget.cpp                       |   32 ++
 libs/ui/connectionwidget.h                         |    6 +
 libs/ui/ifaceitemmodel.cpp                         |    2 -
 libs/ui/scanwidget.cpp                             |    1 -
 libs/ui/security/802_1x.ui                         |   77 ---
 libs/ui/security/802_1x_security_widget.cpp        |   81 ----
 libs/ui/security/802_1x_security_widget.h          |   46 --
 libs/ui/security/eapmethod.h                       |    2 +-
 libs/ui/security/eapmethodinnerauth.cpp            |    4 +-
 libs/ui/security/eapmethodinnerauth.h              |    2 +-
 libs/ui/security/eapmethodleap.cpp                 |   20 +-
 libs/ui/security/eapmethodleap.h                   |    2 +-
 libs/ui/security/eapmethodpeapbase.ui              |   35 ++-
 libs/ui/security/eapmethodsimple.cpp               |    4 +-
 libs/ui/security/eapmethodsimple.h                 |    4 +-
 libs/ui/security/eapmethodsimple.ui                |    3 -
 libs/ui/security/eapmethodsimplebase.ui            |    9 +-
 libs/ui/security/eapmethodstack.cpp                |    4 +-
 libs/ui/security/eapmethodstack.h                  |   10 +-
 libs/ui/security/eapmethodtlsbase.ui               |   42 ++-
 libs/ui/security/eapmethodttlsbase.ui              |   34 ++-
 libs/ui/security/{eapmethodsimple.ui => leap.ui}   |   37 ++-
 libs/ui/security/peapwidget.cpp                    |   41 ++-
 libs/ui/security/security801xwidget.cpp            |   53 --
 ...pmethodinnerauth.cpp => securitydynamicwep.cpp} |   33 +-
 .../security/securitydynamicwep.h}                 |   18 +-
 .../security/{wpaeapwidget.cpp => securityeap.cpp} |  122 ++----
 libs/ui/security/{wpaeapwidget.h => securityeap.h} |   27 +-
 .../security/securityeap_p.h}                      |   27 +-
 .../{wpapskwidget.cpp => securityleap.cpp}         |   57 ++--
 .../ui/security/{wpapskwidget.h => securityleap.h} |   18 +-
 libs/ui/security/securitywired8021x.cpp            |   86 ++++
 .../{eapmethodinnerauth.h => securitywired8021x.h} |   27 +-
 libs/ui/security/tlswidget.cpp                     |  116 ++++-
 libs/ui/security/tlswidget.h                       |   17 +-
 libs/ui/security/ttlswidget.cpp                    |   34 +-
 libs/ui/security/wepwidget.cpp                     |    1 -
 libs/ui/security/wirelesssecuritysettingwidget.cpp |  203 +++++---
 libs/ui/security/wirelesssecuritysettingwidget.h   |   16 +-
 libs/ui/security/wpaeapwidget.cpp                  |  184 +-------
 libs/ui/security/wpaeapwidget.h                    |   41 +-
 libs/ui/security/wpapskwidget.cpp                  |    1 -
 libs/ui/wired.ui                                   |   12 +-
 libs/ui/wiredpreferences.cpp                       |    6 +-
 libs/ui/wiredwidget.cpp                            |    1 +
 libs/ui/wireless.ui                                |   10 +-
 libs/ui/wirelesspreferences.cpp                    |   48 ++-
 libs/ui/wirelesspreferences.h                      |    4 -
 load-module.sh                                     |    5 +
 monolithic/CMakeLists.txt                          |    2 +
 monolithic/interfaceconnectionitem.cpp             |   48 +--
 monolithic/kde4-knetworkmanager-autostart.desktop  |    2 +
 monolithic/knetworkmanager.desktop                 |    2 +
 monolithic/knetworkmanagertrayicon.cpp             |   81 +++-
 monolithic/knetworkmanagertrayicon.h               |   18 +-
 monolithic/monolithic.h                            |    2 +-
 monolithic/tooltipbuilder.cpp                      |   44 +--
 monolithic/vpninterfaceconnectionitem.cpp          |    8 +-
 monolithic/vpninterfaceconnectionitem.h            |    3 +-
 monolithic/wirelessinterfaceconnectionitem.cpp     |    5 -
 monolithic/wirelessinterfaceconnectionitem.h       |    2 -
 monolithic/wirelessstatus.cpp                      |   63 +--
 monolithic/wirelessstatus.h                        |    1 -
 networkmanagement.notifyrc                         |    7 +
 settings/config/CMakeLists.txt                     |    2 +
 settings/config/manageconnectionwidget.cpp         |    1 -
 settings/config/traysettingswidget.h               |    2 +-
 settings/configshell/CMakeLists.txt                |    2 +
 settings/configshell/main.cpp                      |   26 +-
 settings/dbus/CMakeLists.txt                       |   20 -
 settings/dbus/connectioninterface.cpp              |   41 --
 settings/dbus/connectioninterface.h                |   85 ----
 .../dbus/introspection/nm-exported-connection.xml  |  103 ----
 settings/service/knetworkmanager.desktop           |    2 +-
 unload-module.sh                                   |    5 +
 vpnplugins/CMakeLists.txt                          |    1 +
 vpnplugins/openvpn/openvpnprop.ui                  |   59 +--
 vpnplugins/openvpn/openvpnwidget.cpp               |    9 +-
 vpnplugins/pptp/CMakeLists.txt                     |   19 +
 vpnplugins/{vpnc => pptp}/Messages.sh              |    0 
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |   25 +
 vpnplugins/pptp/nm-pptp-service.h                  |   56 +++
 vpnplugins/{vpnc/vpnc.cpp => pptp/pptp.cpp}        |   18 +-
 vpnplugins/{vpnc/vpnc.h => pptp/pptp.h}            |   14 +-
 vpnplugins/pptp/pptpadvanced.ui                    |  224 +++++++++
 vpnplugins/{vpnc/vpncauth.ui => pptp/pptpauth.ui}  |    0 
 vpnplugins/pptp/pptpprop.ui                        |  188 ++++++++
 vpnplugins/pptp/pptpwidget.cpp                     |  248 ++++++++++
 .../{openvpn/openvpnwidget.h => pptp/pptpwidget.h} |   31 +-
 vpnplugins/vpnc/vpncprop.ui                        |    3 +-
 201 files changed, 4051 insertions(+), 3897 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list