[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/runtime/solid-networkstatus/kded
From: Will Stephenson <wstephenson () kde ! org>
Date: 2010-09-28 20:32:37
Message-ID: 20100928203237.50781AC88E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1180766 by wstephens:
Add patch by Sune Vuorela adding an optional QNTrack backend to the
solid-networkstatus kded module.
CCMAIL: sune@vuorela.dk
M +18 -0 CMakeLists.txt
M +6 -0 networkstatus.cpp
A ntracknetworkstate.cpp [License: BSD X11 (BSD like)]
A ntracknetworkstate.h [License: BSD X11 (BSD like)]
--- trunk/KDE/kdebase/runtime/solid-networkstatus/kded/CMakeLists.txt \
#1180765:1180766 @@ -18,6 +18,20 @@
endif(NM_0_7)
endif(NETWORKMANAGER_FOUND)
+find_package(QNtrack)
+
+if(QNTRACK_FOUND)
+ MESSAGE(STATUS "Found QNtrack, will use it as a data input for Solid network \
status") + set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} \
ntracknetworkstate.cpp) + add_definitions(-DHAVE_QNTRACK)
+else(QNTRACK_FOUND)
+ MESSAGE(STATUS "QNtrack not found. Can be used as a data input to Solid network \
status. See https://launchpad.net/ntrack") +endif(QNTRACK_FOUND)
+
+macro_log_feature(QNTRACK_FOUND "QNtrack" "Network status tracking library" \
"http://launchpad.net/ntrack" FALSE "" "Provides data input for Solid network \
status") +
+include_directories(${QNTRACK_INCLUDE_DIR})
+
qt4_add_dbus_adaptor(kded_networkstatus_PART_SRCS \
../org.kde.Solid.Networking.Service.xml networkstatus.h NetworkStatusModule)
@@ -29,7 +43,11 @@
kde4_add_plugin(kded_networkstatus ${kded_networkstatus_PART_SRCS})
+if(QNTRACK_FOUND)
+ target_link_libraries(kded_networkstatus ${KDE4_KDECORE_LIBS} \
${QNTRACK_LIBRARIES}) +else(QNTRACK_FOUND)
target_link_libraries(kded_networkstatus ${KDE4_KDECORE_LIBS})
+endif(QNTRACK_FOUND)
install(TARGETS kded_networkstatus DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/KDE/kdebase/runtime/solid-networkstatus/kded/networkstatus.cpp \
#1180765:1180766 @@ -40,6 +40,7 @@
#endif
#include <kpluginfactory.h>
+#include "ntracknetworkstate.h"
K_PLUGIN_FACTORY(NetworkStatusFactory,
registerPlugin<NetworkStatusModule>();
@@ -75,6 +76,10 @@
new ClientAdaptor( this );
new ServiceAdaptor( this );
+#ifdef HAVE_QNTRACK
+ new NtrackNetworkState( this );
+#endif
+
init();
}
@@ -226,4 +231,5 @@
setNetworkStatus( QLatin1String("SolidNetwork"), status );
}
+
#include "networkstatus.moc"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic