--- a/bearermanagement/S60MCPR/src/s60mpmrequests.cpp Tue Jul 13 11:25:48 2010 +0300
+++ b/bearermanagement/S60MCPR/src/s60mpmrequests.cpp Fri Jul 23 09:11:14 2010 +0300
@@ -847,10 +847,15 @@
// Asynchronous cancellation adds message to MPMServer's IPC queue but since we
// queue all requests we can safely always call the SendCancelRequest()
+ // Sanity check.
+ S60MCPRLOGSTRING2( "S60MCPR::CMPMPolicyRequests<%x>::CancelRequest() %d", this, (TInt)aRequestCode )
+ if ( iPolicyRequests.Count() == 0 )
+ {
+ S60MCPRLOGSTRING1( "S60MCPR::CMPMPolicyRequests<%x>::CancelRequest(): Error: Nothing to cancel!", this )
+ return;
+ }
// If the cancelled request is the active one.
- //
- S60MCPRLOGSTRING2( "S60MCPR::CMPMPolicyRequests<%x>::CancelRequest() %d", this, (TInt)aRequestCode )
- if ( iPolicyRequests[0].iRequestType == aRequestCode )
+ else if ( iPolicyRequests[0].iRequestType == aRequestCode )
{
// Cancel the query if active
//
@@ -877,7 +882,6 @@
}
}
// Else we need to find it from the queue
- //
else
{
S60MCPRLOGSTRING1( "S60MCPR::CMPMPolicyRequests<%x>::CancelRequest() Cancelling pending request", this )
--- a/ipcm_plat/extended_connection_settings_api/group/bld.inf Tue Jul 13 11:25:48 2010 +0300
+++ b/ipcm_plat/extended_connection_settings_api/group/bld.inf Fri Jul 23 09:11:14 2010 +0300
@@ -27,7 +27,6 @@
../inc/cmdestinationext.h MW_LAYER_PLATFORM_EXPORT_PATH(cmdestinationext.h)
../inc/cmconnectionmethodext.h MW_LAYER_PLATFORM_EXPORT_PATH(cmconnectionmethodext.h)
../inc/cmpsettingsconsts.h MW_LAYER_PLATFORM_EXPORT_PATH(cmpsettingsconsts.h)
-../inc/cmsettingsui.h MW_LAYER_PLATFORM_EXPORT_PATH(cmsettingsui.h)
../inc/cmcommonui.h MW_LAYER_PLATFORM_EXPORT_PATH(cmcommonui.h)
../inc/cmmanagerext.h MW_LAYER_PLATFORM_EXPORT_PATH(cmmanagerext.h)
../inc/cmmanagerkeys.h MW_LAYER_PLATFORM_EXPORT_PATH(cmmanagerkeys.h)
--- a/ipcm_plat/extended_connection_settings_api/inc/cmsettingsui.h Tue Jul 13 11:25:48 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of settings UI
-*
-*/
-
-#ifndef C_CMSETTINGSUI_H
-#define C_CMSETTINGSUI_H
-
-// Deprecation warning
-#warning This header file is deprecated and will be removed. See Polonium CR #461 for details.
-
-#include <e32def.h>
-#include <e32base.h>
-
-class CCmSettingsUiImpl;
-
-/**
- * Implementation of Setting UI
- *
- * @lib cmmanager.lib
- * @since S60 v3.2
- */
-NONSHARABLE_CLASS(CCmSettingsUi) : public CBase
- {
- public:
-
- enum TResult
- {
- EBack,
- EExit
- };
-
- /** Epoc constructor */
- IMPORT_C static CCmSettingsUi* NewL();
-
- /** Destructor */
- virtual ~CCmSettingsUi();
-
- //=========================================================================
- // UI API
- //
- public:
-
- /**
- * Launches the Settings UI
- * for handling Destinations and Connection Methods
- * @since 3.2
- * @return TResult - the softkey the user exited with
- */
- IMPORT_C TResult RunSettingsL();
-
- /**
- * Launches a dialog with a list of Destination
- * @since 3.2
- * @param aDestinationId ID of the selected Destination
- * @return TBool
- */
- IMPORT_C TBool SelectDestinationDlgL( TUint32& aDestinationId );
-
- private:
-
- /** First stage constructor */
- CCmSettingsUi();
-
- /** Epoc constructor */
- void ConstructL();
-
- private: // data
-
- CCmSettingsUiImpl* iImpl;
- };
-
-#endif // C_CMSETTINGSUI_H
--- a/ipcm_pub/connection_settings_api/group/bld.inf Tue Jul 13 11:25:48 2010 +0300
+++ b/ipcm_pub/connection_settings_api/group/bld.inf Fri Jul 23 09:11:14 2010 +0300
@@ -37,5 +37,4 @@
../inc/cmpluginvpndef.h MW_LAYER_PUBLIC_EXPORT_PATH(cmpluginvpndef.h)
../inc/cmpluginhscsddef.h MW_LAYER_PUBLIC_EXPORT_PATH(cmpluginhscsddef.h)
../inc/cmmanager.h MW_LAYER_PUBLIC_EXPORT_PATH(cmmanager.h)
-../inc/cmsettingsui.h MW_LAYER_PUBLIC_EXPORT_PATH(cmsettingsui.h)
../inc/cmgenconnsettings.h MW_LAYER_PUBLIC_EXPORT_PATH(cmgenconnsettings.h)
--- a/ipcm_pub/connection_settings_api/inc/cmsettingsui.h Tue Jul 13 11:25:48 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Implementation of settings UI
-*
-*/
-
-#ifndef C_CMSETTINGSUI_H
-#define C_CMSETTINGSUI_H
-
-#include <E32def.h>
-#include <e32base.h>
-
-class CCmSettingsUiImpl;
-
-/**
- * Implementation of Setting UI
- *
- * @lib cmmanager.lib
- * @since S60 v3.2
- */
-NONSHARABLE_CLASS(CCmSettingsUi) : public CBase
- {
- public:
-
- enum TResult
- {
- EBack,
- EExit
- };
-
- /** Epoc constructor */
- IMPORT_C static CCmSettingsUi* NewL();
-
- /** Destructor */
- virtual ~CCmSettingsUi();
-
- //=========================================================================
- // UI API
- //
- public:
-
- /**
- * Launches the Settings UI
- * for handling Destinations and Connection Methods
- * @since 3.2
- * @return TResult - the softkey the user exited with
- */
- IMPORT_C TResult RunSettingsL();
-
- /**
- * Launches a dialog with a list of Destination
- * @since 3.2
- * @param aDestinationId ID of the selected Destination
- * @return TBool
- */
- IMPORT_C TBool SelectDestinationDlgL( TUint32& aDestinationId );
-
- private:
-
- /** First stage constructor */
- CCmSettingsUi();
-
- /** Epoc constructor */
- void ConstructL();
-
- private: // data
-
- CCmSettingsUiImpl* iImpl;
- };
-
-#endif // C_CMSETTINGSUI_H