summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-07-12 18:25:44 (GMT)
committeraxis <qt-info@nokia.com>2010-07-13 13:53:25 (GMT)
commitb47ab877e8632f0ab2508f67d00986a0e344b7ba (patch)
treeabdfe7e25193291c3925829a5031c01022d09eda
parent64f66cbfb924ed1810b120950273c2f58e3a2077 (diff)
downloadQt-b47ab877e8632f0ab2508f67d00986a0e344b7ba.zip
Qt-b47ab877e8632f0ab2508f67d00986a0e344b7ba.tar.gz
Qt-b47ab877e8632f0ab2508f67d00986a0e344b7ba.tar.bz2
Revert "Making network reconnect happen after teardown."
This reverts commit 1e91d6b79cba488fa5c6f7d954de611903837f76. Should not be necessary anymore after 61daa2f41969688.
-rw-r--r--src/corelib/kernel/qeventdispatcher_symbian.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index ea207f0..2a52044 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -47,8 +47,6 @@
#include <unistd.h>
#include <errno.h>
-#include <net/if.h>
-
QT_BEGIN_NAMESPACE
#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
@@ -577,15 +575,13 @@ void QSelectThread::updateActivatedNotifiers(QSocketNotifier::Type type, fd_set
* check if socket is in exception set
* then signal RequestComplete for it
*/
- qWarning("exception on %d [will do setdefaultif(0) - hack]", i.key()->socket());
+ qWarning("exception on %d [will close the socket handle - hack]", i.key()->socket());
// quick fix; there is a bug
// when doing read on socket
// errors not preoperly mapped
// after offline-ing the device
// on some devices we do get exception
- // close all exiting sockets
- // and reset default IAP
- ::setdefaultif(0);
+ ::close(i.key()->socket());
toRemove.append(i.key());
TRequestStatus *status = i.value();
QEventDispatcherSymbian::RequestComplete(d->threadData->symbian_thread_handle, status, KErrNone);