From 259ae3880dd5abd572ce05e3ac14c395e451afc9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 26 Nov 2012 16:32:42 -0600 Subject: [PATCH] Fix unexported library and increase NM DBUS timeout --- tdecore/networkbackends/network-manager/network-manager.cpp | 4 +++- tdecore/tdenetworkconnections.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp index a4ff24a90..9b0a466e7 100644 --- a/tdecore/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/networkbackends/network-manager/network-manager.cpp @@ -37,7 +37,9 @@ #define UPDATE_STRING_SETTING_IF_VALID(string, key, settingsMap) if (!string.isNull()) settingsMap[key] = convertDBUSDataToVariantData(TQT_DBusData::fromString(string)); \ else settingsMap.remove(key); -#define NM_ASYNC_TIMEOUT_MS 1000 +//#define NM_ASYNC_TIMEOUT_MS 1000 +// Give the user 5 minutes to authenticate to DBUS before timing out +#define NM_ASYNC_TIMEOUT_MS (5*60*1000) TQ_UINT32 reverseIPV4ByteOrder(TQ_UINT32 address) { TQ_UINT32 ret; diff --git a/tdecore/tdenetworkconnections.h b/tdecore/tdenetworkconnections.h index 7a05a003f..532618ab0 100644 --- a/tdecore/tdenetworkconnections.h +++ b/tdecore/tdenetworkconnections.h @@ -599,7 +599,7 @@ class TDECORE_EXPORT TDENetworkSingleRouteConfiguration typedef TQValueList TDENetworkSingleRouteConfigurationList; -class TDENetworkIEEE8021xConfiguration +class TDECORE_EXPORT TDENetworkIEEE8021xConfiguration { public: TDENetworkIEEE8021xConfiguration();