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

Michael Biebl biebl at alioth.debian.org
Tue Sep 14 21:18:38 UTC 2010


The following commit has been merged in the master branch:
commit 456a892ed2e2850e5dc98a5240deb745f4eff5b9
Merge: 8a19944e646af5330ff887d8e29969d578316aef 906cb06093c2c1c3e9809359fd1c6b97a7def350
Author: Michael Biebl <biebl at debian.org>
Date:   Tue Sep 14 21:32:12 2010 +0200

    Merge branch 'upstream'

 CMakeLists.txt                                     |    6 +
 applet/CMakeLists.txt                              |    7 +-
 applet/Messages.sh                                 |    1 +
 applet/README.txt                                  |   34 ++
 applet/activatableitem.cpp                         |   38 ++-
 applet/activatableitem.h                           |    5 +
 applet/activatablelistwidget.cpp                   |   80 +++-
 applet/activatablelistwidget.h                     |    8 +-
 ...workitem.cpp => gsminterfaceconnectionitem.cpp} |  110 ++---
 ...snetworkitem.h => gsminterfaceconnectionitem.h} |   34 +-
 applet/interfacedetailswidget.cpp                  |  379 ++++++++++++++---
 applet/interfacedetailswidget.h                    |   30 +-
 applet/interfaceitem.cpp                           |  105 ++++--
 applet/interfaceitem.h                             |   13 +-
 applet/networkmanager.cpp                          |   33 +-
 applet/networkmanager.h                            |    7 +-
 applet/nmpopup.cpp                                 |   44 ++-
 applet/nmpopup.h                                   |    1 +
 applet/plasma-applet-networkmanagement.desktop     |   29 +-
 kded/networkmanagement.desktop                     |   29 +-
 kded/service.cpp                                   |    1 -
 libs/client/CMakeLists.txt                         |    8 +
 libs/client/remoteactivatablelist.cpp              |    5 +
 libs/client/remotegsminterfaceconnection.cpp       |   52 +++
 ...connection.h => remotegsminterfaceconnection.h} |   26 +-
 ...ection_p.h => remotegsminterfaceconnection_p.h} |   12 +-
 libs/externals/CMakeLists.txt                      |    7 +
 libs/internals/CMakeLists.txt                      |    2 +
 libs/internals/activatable.h                       |    5 +-
 libs/internals/connectionpersistence.cpp           |    3 +
 libs/internals/gsminterfaceconnection.cpp          |   79 ++++
 libs/internals/gsminterfaceconnection.h            |   68 +++
 libs/internals/gsminterfaceconnectionhelpers.cpp   |  114 +++++
 ...onhelpers.h => gsminterfaceconnectionhelpers.h} |   28 +-
 libs/internals/gsminterfaceconnectionhelpers_p.h   |   78 ++++
 libs/internals/vpninterfaceconnection.h            |    3 +-
 libs/service/CMakeLists.txt                        |   14 +
 libs/service/configurationlauncher.cpp             |    1 +
 .../gsmnetworkinterfaceactivatableprovider.cpp     |   93 ++++
 ....h => gsmnetworkinterfaceactivatableprovider.h} |   37 +-
 ...de.networkmanagement.gsminterfaceconnection.xml |   20 +
 libs/service/networkinterfaceactivatableprovider.h |    1 +
 libs/service/networkinterfacemonitor.cpp           |    8 +
 libs/service/sessionabstractedservice.cpp          |   11 +
 libs/ui/802_11_wirelesswidget.cpp                  |    1 +
 libs/ui/802_11_wirelesswidget.h                    |    3 +
 libs/ui/connectioneditor.cpp                       |   26 ++
 libs/ui/connectionwidget.cpp                       |    4 +
 libs/ui/connectionwidget.h                         |    4 +-
 libs/ui/networkmanagement_vpnuiplugin.desktop      |   28 +-
 libs/ui/wirelesspreferences.cpp                    |    7 +-
 monolithic/Messages.sh                             |    1 +
 monolithic/activatableitem_p.h                     |    4 +
 monolithic/kde4-knetworkmanager-autostart.desktop  |   51 +--
 monolithic/knetworkmanager.desktop                 |   51 +--
 monolithic/knetworkmanagertrayicon.cpp             |    4 +-
 monolithic/otherwirelessnetworkdialog.cpp          |    2 -
 networkmanagement.notifyrc                         |  460 ++++++--------------
 settings/config/CMakeLists.txt                     |   14 +-
 settings/config/kcm_networkmanagement.desktop      |   25 +-
 settings/config/kcm_networkmanagement_tray.desktop |   29 +-
 settings/config/manageconnectionwidget.ui          |   10 +-
 settings/config/managetraywidget.cpp               |   66 +---
 settings/config/managetraywidget.h                 |   13 +-
 settings/config/menutooltipsettingswidget.cpp      |  218 ---------
 settings/config/menutooltipsettingswidget.h        |   80 ----
 settings/config/menutooltipsettingswidget.ui       |  232 ----------
 settings/config/othersettings.ui                   |  114 +++++
 .../config/othersettingswidget.cpp                 |   36 +-
 .../config/othersettingswidget.h                   |   27 +-
 settings/config/storage.ui                         |   63 ---
 settings/config/traysettingswidget.cpp             |  230 ----------
 settings/config/traysettingswidget.h               |   52 ---
 settings/configshell/CMakeLists.txt                |    7 +-
 tests/qdbusfornm.cpp                               |   18 +-
 .../networkmanagement_novellvpnui.desktop          |   26 +-
 .../openvpn/networkmanagement_openvpnui.desktop    |   32 +-
 vpnplugins/pptp/networkmanagement_pptpui.desktop   |   30 +-
 .../networkmanagement_strongswanui.desktop         |   21 +-
 vpnplugins/vpnc/networkmanagement_vpncui.desktop   |   31 +-
 80 files changed, 1869 insertions(+), 1820 deletions(-)

-- 
"Network Management" Plasma widget Debian packaging



More information about the pkg-kde-commits mailing list