diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-07-03 11:28:40 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-07-03 11:28:40 (GMT) |
| commit | 6fa67856b88aaab401ef056b5f22d74a491857c3 (patch) | |
| tree | bbc70154738a53202c2ea91aed37bca118b2117f /examples/network | |
| parent | d010f184de1fd47ec2766bd7cd3a5dccd3b543e6 (diff) | |
| parent | b82e27ad7642ae76a5e918b41f0e65ecc27034fc (diff) | |
| download | Qt-6fa67856b88aaab401ef056b5f22d74a491857c3.zip Qt-6fa67856b88aaab401ef056b5f22d74a491857c3.tar.gz Qt-6fa67856b88aaab401ef056b5f22d74a491857c3.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'examples/network')
| -rw-r--r-- | examples/network/ftp/sym_iap_util.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/examples/network/ftp/sym_iap_util.h b/examples/network/ftp/sym_iap_util.h index 5f6e41a..487aa8b 100644 --- a/examples/network/ftp/sym_iap_util.h +++ b/examples/network/ftp/sym_iap_util.h @@ -41,10 +41,11 @@ #ifndef QSYM_IAP_UTIL_H #define QSYM_IAP_UTIL_H +// Symbian #include <es_sock.h> #include <es_enum.h> -#include <commdbconnpref.h> +// OpenC #include <sys/socket.h> #include <net/if.h> @@ -69,8 +70,6 @@ static void qt_SetDefaultIapL() { TUint count; TBool activeLanConnectionFound = EFalse; - TRequestStatus status; - TCommDbConnPref prefs; RSocketServ serv; CleanupClosePushL(serv); @@ -117,8 +116,7 @@ static void qt_SetDefaultIapL() */ conn.Close(); // might be opened after attach User::LeaveIfError(conn.Open(serv)); - prefs.SetDialogPreference( ECommDbDialogPrefPrompt ); - User::LeaveIfError(conn.Start(prefs)); + User::LeaveIfError(conn.Start()); User::LeaveIfError(conn.GetDesSetting(TPtrC(KIapNameSetting), iapName)); } @@ -131,9 +129,6 @@ static void qt_SetDefaultIapL() User::LeaveIfError(setdefaultif(&ifReq)); - conn.Close(); - serv.Close(); - CleanupStack::PopAndDestroy(&conn); CleanupStack::PopAndDestroy(&serv); } |