[SCM] KDE Base Workspace module packaging branch, kde4.5, updated. debian/4.4.5-3-29-g76de6e3

[George Kiagiadakis]

The following commit has been merged in the kde4.5 branch:
commit fab3064617edde349a9b4fafc38e7412b2386bd9
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Fri Aug 20 11:58:57 2010 +0300

    Refresh the ntrack patch to apply on 4.5.
---
 debian/patches/99_solid_network_use_ntrack.diff |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/debian/patches/99_solid_network_use_ntrack.diff b/debian/patches/99_solid_network_use_ntrack.diff
index 7590ff1..69bf374 100644
--- a/debian/patches/99_solid_network_use_ntrack.diff
+++ b/debian/patches/99_solid_network_use_ntrack.diff
@@ -89,7 +89,7 @@ Patch forwarded, hopefully it will soon be applied
 +
 --- a/solid/networking/kded/CMakeLists.txt
 +++ b/solid/networking/kded/CMakeLists.txt
-@@ -6,6 +6,20 @@ set(kded_networkstatus_PART_SRCS network
+@@ -6,6 +6,20 @@
  #    MESSAGE(STATUS "Adding in-process NetworkManager service-wart to kded module")
  #endif(NETWORKMANAGER_FOUND)
  
@@ -110,7 +110,7 @@ Patch forwarded, hopefully it will soon be applied
  qt4_add_dbus_adaptor(kded_networkstatus_PART_SRCS ../org.kde.Solid.Networking.Service.xml
          networkstatus.h NetworkStatusModule)
  
-@@ -17,7 +31,10 @@ qt4_add_dbus_adaptor(kded_networkstatus_
+@@ -17,7 +31,10 @@
  
  kde4_add_plugin(kded_networkstatus ${kded_networkstatus_PART_SRCS})
  
@@ -178,7 +178,7 @@ Patch forwarded, hopefully it will soon be applied
 +#endif // NTRACKNETWORKSTATE_H
 --- a/solid/networking/kded/networkstatus.cpp
 +++ b/solid/networking/kded/networkstatus.cpp
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
  #include "serviceadaptor.h"
  
  #include <kpluginfactory.h>
@@ -186,7 +186,7 @@ Patch forwarded, hopefully it will soon be applied
  
  K_PLUGIN_FACTORY(NetworkStatusFactory,
                   registerPlugin<NetworkStatusModule>();
-@@ -66,6 +67,10 @@ NetworkStatusModule::NetworkStatusModule
+@@ -68,6 +69,10 @@
      new ClientAdaptor( this );
      new ServiceAdaptor( this );
  
@@ -194,16 +194,9 @@ Patch forwarded, hopefully it will soon be applied
 +    new NtrackNetworkState( this );
 +#endif
 +
-     QDBusConnection dbus = QDBusConnection::sessionBus();
-     QDBusConnectionInterface * sessionBus = dbus.interface();
- 
-@@ -189,5 +194,6 @@ void NetworkStatusModule::solidNetworkin
-     setNetworkStatus( QLatin1String("SolidNetwork"), status );
+     init();
  }
  
-+
- #include "networkstatus.moc"
- // vim: set noet sw=4 ts=4:
 --- /dev/null
 +++ b/cmake/modules/FindQNtrack.cmake
 @@ -0,0 +1,70 @@

-- 
KDE Base Workspace module packaging