diff options
| author | Timothy Pearson <[email protected]> | 2012-08-27 11:31:08 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-08-27 11:31:08 -0500 |
| commit | cfbdd55bb39f6e2012103a506d8d2506145cc936 (patch) | |
| tree | 98914c5e8f41cc7777aab4eec23f9344071dc7f8 /tdecore/tdehardwaredevices.cpp | |
| parent | 2d67c1c6b2606b2c96831a44da73afe41fb8b6e1 (diff) | |
| download | tdelibs-cfbdd55bb39f6e2012103a506d8d2506145cc936.tar.gz tdelibs-cfbdd55bb39f6e2012103a506d8d2506145cc936.zip | |
Add very preliminary network-manager backend support
Diffstat (limited to 'tdecore/tdehardwaredevices.cpp')
| -rw-r--r-- | tdecore/tdehardwaredevices.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index ab3c06e91..293454457 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -16,8 +16,6 @@ Boston, MA 02110-1301, USA. */ -#define USE_NETWORKMANAGER_NETWORK_BACKEND - #include <tdehardwaredevices.h> #include <tqfile.h> @@ -61,9 +59,12 @@ // Network connection manager #include "tdenetworkconnections.h" -#ifdef USE_NETWORKMANAGER_NETWORK_BACKEND +// Compile-time configuration +#include "config.h" + +#ifdef WITH_NETWORK_MANAGER_BACKEND #include "networkbackends/network-manager/network-manager.h" -#endif // USE_NETWORKMANAGER_NETWORK_BACKEND +#endif // WITH_NETWORK_MANAGER_BACKEND // BEGIN BLOCK // Copied from include/linux/genhd.h @@ -1458,11 +1459,11 @@ void TDENetworkDevice::internalSetTxPackets(double tx) { } TDENetworkConnectionManager* TDENetworkDevice::connectionManager() { -#ifdef USE_NETWORKMANAGER_NETWORK_BACKEND +#ifdef WITH_NETWORK_MANAGER_BACKEND if (!m_connectionManager) { m_connectionManager = new TDENetworkConnectionManager_BackendNM(m_macAddress); } -#endif // USE_NETWORKMANAGER_NETWORK_BACKEND +#endif // WITH_NETWORK_MANAGER_BACKEND return m_connectionManager; } |