--- a/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsDlg.cpp Thu Dec 17 08:47:43 2009 +0200
+++ b/wlansecuritysettings/wepsecuritysettingsui/src/WEPSecuritySettingsDlg.cpp Thu Jan 07 12:48:38 2010 +0200
@@ -962,7 +962,7 @@
dialog->ExecuteLD( *stringLabel );
- CleanupStack::PopAndDestroy( stringLabel ); // stringLabel
+ delete stringLabel; // stringLabel
ptrKeyData.Zero();
}
--- a/wlansecuritysettings/wifiprotectedsetup/group/bld.inf Thu Dec 17 08:47:43 2009 +0200
+++ b/wlansecuritysettings/wifiprotectedsetup/group/bld.inf Thu Jan 07 12:48:38 2010 +0200
@@ -36,8 +36,6 @@
./wifiprotclient.mmp
./wifiprotplugin.mmp
-// gnumakefile wifiprot_icons.mk
-
PRJ_EXTENSIONS
START EXTENSION s60/mifconv
--- a/wlansecuritysettings/wifiprotectedsetup/group/wifiprot_icons.mk Thu Dec 17 08:47:43 2009 +0200
+++ b/wlansecuritysettings/wifiprotectedsetup/group/wifiprot_icons.mk Thu Jan 07 12:48:38 2010 +0200
@@ -2,16 +2,16 @@
# Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
#
# Contributors:
#
-# Description: Makefile for icons of Wi-Fi Protected Setup UI
+# Description: Makefile for icons of WPS UI
#
ifeq (WINS,$(findstring WINS, $(PLATFORM)))
--- a/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsDlg.cpp Thu Dec 17 08:47:43 2009 +0200
+++ b/wlansecuritysettings/wpasecuritysettingsui/src/WPASecuritySettingsDlg.cpp Thu Jan 07 12:48:38 2010 +0200
@@ -720,9 +720,11 @@
CAknInformationNote* dialog = new ( ELeave )
CAknInformationNote( ETrue );
-
+ CleanupStack::Pop( stringLabel );
+
dialog->ExecuteLD( *stringLabel );
- CleanupStack::PopAndDestroy( stringLabel );
+
+ delete stringLabel;
}
else
{