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

Michael Biebl biebl at alioth.debian.org
Thu May 13 00:48:56 UTC 2010


The following commit has been merged in the master branch:
commit 721441e8f2af2b933f5cd7ef3d6ca0781ed9563d
Merge: 1544c50efb41f66a1b1e665404a1c39ead066e8e d0f6fe775fc76e6bec5baba4b480d012d339139f
Author: Michael Biebl <biebl at debian.org>
Date:   Wed May 12 02:23:46 2010 +0200

    Merge branch 'upstream'

 applet/CMakeLists.txt                              |   10 +-
 applet/README.txt                                  |    6 +-
 applet/activatableitem.cpp                         |   76 +++-
 applet/activatableitem.h                           |    5 +-
 applet/activatablelistwidget.cpp                   |   99 ++++-
 applet/activatablelistwidget.h                     |   19 +-
 applet/hiddenwirelessnetworkitem.h                 |    6 +-
 applet/interfaceconnectionitem.cpp                 |   30 +-
 applet/interfaceconnectionitem.h                   |    5 +-
 applet/interfacedetailswidget.cpp                  |  250 +++++++++++
 applet/interfacedetailswidget.h                    |   73 ++++
 applet/interfaceitem.cpp                           |  254 ++++++++----
 applet/interfaceitem.h                             |   74 +++--
 applet/networkmanager.cpp                          |  440 +++++++++++++-------
 applet/networkmanager.h                            |   58 ++-
 applet/nmpopup.cpp                                 |  424 +++++++++++++++++++
 applet/{nmextenderitem.h => nmpopup.h}             |   58 ++--
 applet/vpninterfaceitem.cpp                        |  196 +++++++++
 applet/vpninterfaceitem.h                          |   64 +++
 applet/wireless.svgz                               |  Bin 0 -> 44371 bytes
 applet/wirelessinterfaceitem.cpp                   |   88 +---
 applet/wirelessinterfaceitem.h                     |   21 +-
 applet/wirelessnetworkitem.cpp                     |  151 ++------
 applet/wirelessnetworkitem.h                       |   29 +-
 applet/wirelessstatus.cpp                          |  219 ++++++++++
 {monolithic => applet}/wirelessstatus.h            |   45 ++-
 libs/client/remoteactivatablelist.cpp              |   19 +-
 libs/internals/CMakeLists.txt                      |    3 +-
 libs/internals/connectionpersistence.cpp           |    4 +-
 libs/internals/kconfig_compiler.cpp                |    1 +
 libs/internals/uiutils.cpp                         |   49 ++-
 libs/internals/uiutils.h                           |   21 +-
 libs/service/notificationmanager.cpp               |   18 +-
 libs/service/sessionabstractedservice.cpp          |    3 +
 libs/ui/802-11-wireless.ui                         |  288 ++++++-------
 libs/ui/CMakeLists.txt                             |    2 -
 libs/ui/connection.ui                              |  188 ++++-----
 libs/ui/connectionsecretsjob.cpp                   |    1 +
 libs/ui/connectionwidget.cpp                       |    2 +
 libs/ui/gsm.ui                                     |  420 ++++++++++---------
 libs/ui/ipv4.ui                                    |  240 +++++++----
 libs/ui/ipv4advanced.ui                            |  202 +++++-----
 libs/ui/ipv4advancedwidget.cpp                     |    1 +
 libs/ui/ipv4widget.cpp                             |    3 +
 libs/ui/networkmanagement_vpnuiplugin.desktop      |    4 +-
 libs/ui/ppp.ui                                     |  235 ++++++++---
 libs/ui/pppoe.ui                                   |  112 +++---
 libs/ui/security/eapmethodstackbase.ui             |   26 ++
 libs/ui/security/leap.ui                           |    4 +-
 libs/ui/security/wirelesssecurity.ui               |   45 ++-
 libs/ui/security/wirelesssecuritysettingwidget.cpp |    3 +
 libs/ui/wired.ui                                   |  144 +++----
 monolithic/activatableitem.cpp                     |    2 +
 monolithic/connectioninfoipv4tab.cpp               |    6 +-
 monolithic/interfaceconnectionitem.cpp             |    2 +
 networkmanagement.notifyrc                         |   14 +-
 settings/config/CMakeLists.txt                     |    2 +
 settings/config/addeditdeletebuttonset.cpp         |   65 +++
 ...aysettingswidget.h => addeditdeletebuttonset.h} |   50 ++-
 settings/config/kcm_networkmanagement.desktop      |    4 +-
 settings/config/kcm_networkmanagement_tray.desktop |    4 +-
 settings/config/manageconnectionwidget.cpp         |   36 +-
 settings/config/manageconnectionwidget.h           |    5 +
 settings/config/manageconnectionwidget.ui          |   76 +---
 vpnplugins/CMakeLists.txt                          |    1 +
 .../openvpn/networkmanagement_openvpnui.desktop    |    2 +-
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |    2 +-
 vpnplugins/strongswan/CMakeLists.txt               |   25 ++
 .../networkmanagement_strongswanui.desktop         |   37 ++
 vpnplugins/strongswan/nm-strongswan-service.h      |   42 ++
 .../novellvpn.cpp => strongswan/strongswan.cpp}    |   21 +-
 .../{pptp/pptp.h => strongswan/strongswan.h}       |   13 +-
 vpnplugins/strongswan/strongswanauth.ui            |   97 +++++
 .../vpncprop.ui => strongswan/strongswanprop.ui}   |  246 ++++-------
 vpnplugins/strongswan/strongswanwidget.cpp         |  207 +++++++++
 .../vpncwidget.h => strongswan/strongswanwidget.h} |   25 +-
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |    2 +-
 77 files changed, 3956 insertions(+), 1768 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list