summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-26 16:32:42 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-26 16:32:42 -0600
commit259ae3880dd5abd572ce05e3ac14c395e451afc9 (patch)
treef5751f0ba295262192e1f9edabee1ce9678a639f
parent1351acec11a5f985ef664119c54aba254195f8b2 (diff)
downloadtdelibs-259ae3880dd5abd572ce05e3ac14c395e451afc9.tar.gz
tdelibs-259ae3880dd5abd572ce05e3ac14c395e451afc9.zip
Fix unexported library and increase NM DBUS timeout
-rw-r--r--tdecore/networkbackends/network-manager/network-manager.cpp4
-rw-r--r--tdecore/tdenetworkconnections.h2
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<TDENetworkSingleRouteConfiguration> TDENetworkSingleRouteConfigurationList;
-class TDENetworkIEEE8021xConfiguration
+class TDECORE_EXPORT TDENetworkIEEE8021xConfiguration
{
public:
TDENetworkIEEE8021xConfiguration();