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

[Michael Biebl]

The following commit has been merged in the master branch:
commit 51580a29210b1e16dd805ff2b94214c533a85dd4
Merge: 2651ce3dfa92c024e69a2f5956db1cf0233769cf db91b558d17e11dc1b6c7dcac1d7d1e2051f1981
Author: Michael Biebl <biebl at debian.org>
Date:   Wed Jun 2 00:03:24 2010 +0200

    Merge branch 'upstream'

 CMakeLists.txt                                     |    7 +
 applet/CMakeLists.txt                              |   12 +-
 applet/README.txt                                  |   21 +-
 applet/activatableitem.cpp                         |    2 +-
 applet/activatablelistwidget.h                     |    2 +-
 {monolithic => applet}/icons/CMakeLists.txt        |    3 +
 applet/icons/ox32-device-network-defaultroute.png  |  Bin 0 -> 2683 bytes
 applet/interfacedetailswidget.cpp                  |  504 ++++++++++++++------
 applet/interfacedetailswidget.h                    |   62 ++-
 applet/interfaceitem.cpp                           |   21 +-
 applet/network.svgz                                |  Bin 0 -> 31425 bytes
 applet/networkmanager.cpp                          |   65 ++--
 applet/nmextenderitem.cpp                          |  401 ----------------
 applet/nmextenderitem.h                            |  104 ----
 applet/nmpopup.cpp                                 |   89 +++-
 applet/nmpopup.h                                   |    3 +-
 applet/plasma-applet-networkmanagement.desktop     |    4 +-
 applet/wireless.svgz                               |  Bin 44371 -> 0 bytes
 applet/wirelessinterfaceitem.cpp                   |   26 +-
 kded/networkmanagement.desktop                     |   33 +-
 libs/internals/knmserviceprefs.kcfg                |    1 +
 libs/internals/uiutils.cpp                         |   58 ++-
 libs/internals/uiutils.h                           |    7 +
 libs/service/events.cpp                            |    1 +
 libs/service/events.h                              |    1 +
 libs/service/notificationmanager.cpp               |    6 +
 libs/ui/ifaceitemmodel.cpp                         |  211 --------
 libs/ui/ifaceitemmodel.h                           |   68 ---
 libs/ui/networkmanagement_vpnuiplugin.desktop      |    2 +-
 libs/ui/security/eapmethodsimple.ui                |   57 ---
 libs/ui/security/security.ui                       |  488 -------------------
 monolithic/CMakeLists.txt                          |    8 +-
 monolithic/kde4-knetworkmanager-autostart.desktop  |    5 +-
 monolithic/knetworkmanager.desktop                 |    5 +-
 monolithic/monolithic.cpp                          |   39 ++
 monolithic/monolithic.h                            |    5 +
 networkmanagement.notifyrc                         |   37 ++-
 settings/config/kcm_networkmanagement.desktop      |    5 +-
 settings/config/kcm_networkmanagement_tray.desktop |    3 +
 settings/config/traysettings.ui                    |    5 +
 .../openvpn/networkmanagement_openvpnui.desktop    |    4 +
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |    3 +
 vpnplugins/pptp/pptpwidget.cpp                     |    6 +
 .../networkmanagement_strongswanui.desktop         |    3 +
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |    4 +
 45 files changed, 767 insertions(+), 1624 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging