--- a/alwayson_net_plugin/pdpcontextmanager2/src/10281f41.rss Mon May 24 20:51:35 2010 +0300
+++ b/alwayson_net_plugin/pdpcontextmanager2/src/10281f41.rss Thu May 27 11:12:59 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
@@ -15,9 +15,7 @@
*
*/
-
-
-#include <Ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
RESOURCE REGISTRY_INFO theInfo
{
--- a/bearermanagement/mpm/src/mpmiapselection.cpp Mon May 24 20:51:35 2010 +0300
+++ b/bearermanagement/mpm/src/mpmiapselection.cpp Thu May 27 11:12:59 2010 +0300
@@ -350,34 +350,39 @@
if ( iSession->IsConfirmFirstL( validateIapId ) &&
!( iSession->MyServer().CommsDatAccess()->IsVirtualIapL( validateIapId ) ))
{
- // Check if we are roaming and cellular data usage query has not yet been presented
- // to the user in this country
- if ( iSession->MyServer().RoamingWatcher()->RoamingStatus() == EMPMInternationalRoaming )
+
+ // Check whether queries are enabled
+ if ( !( iChooseIapPref.NoteBehaviour()
+ & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) )
{
- // Check whether queries are enabled
- if ( !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) )
- {
- TConnectionId connId = iSession->ConnectionId();
-
- // International roaming
- iConfirmDlgStarting = CMPMConfirmDlgStarting::NewL(
- *this,
- connId,
- snap,
- validateIapId,
- CMPMConfirmDlg::EConfirmDlgVisitorNetwork,
- iChooseIapPref,
- iSession->MyServer(),
- *iSession,
- EExplicitConnection );
- return;
- }
- else
- {
- // Queries disabled, connection must fail
- ChooseIapComplete( KErrPermissionDenied, &iChooseIapPref );
- return;
- }
+
+ TConnectionId connId = iSession->ConnectionId();
+
+ // Set confirmation type based on roaming status
+ CMPMConfirmDlg::TDialogType type =
+ CMPMConfirmDlg::EConfirmDlgHomeNetwork;
+ if ( iSession->MyServer().RoamingWatcher()->RoamingStatus()
+ == EMPMInternationalRoaming ) {
+ type = CMPMConfirmDlg::EConfirmDlgVisitorNetwork;
+ }
+
+ iConfirmDlgStarting = CMPMConfirmDlgStarting::NewL(
+ *this,
+ connId,
+ snap,
+ validateIapId,
+ type,
+ iChooseIapPref,
+ iSession->MyServer(),
+ *iSession,
+ EExplicitConnection );
+ return;
+ }
+ else
+ {
+ // Queries disabled, connection must fail
+ ChooseIapComplete( KErrPermissionDenied, &iChooseIapPref );
+ return;
}
}
@@ -455,10 +460,10 @@
// Check if any suitable IAP's were found, if not then complete selection with error code
if ( validateIapId == 0 )
{
- if ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeDefault ||
+ if ( !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) &&
+ ( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeDefault ||
( iChooseIapPref.ConnType() == TMpmConnPref::EConnTypeExplicit &&
- !( iChooseIapPref.NoteBehaviour() & TExtendedConnPref::ENoteBehaviourConnDisableQueries ) &&
- iCommsDatAccess->IsInternetSnapL( 0, snap ) ) )
+ iCommsDatAccess->IsInternetSnapL( 0, snap ) ) ) )
{
ImplicitConnectionL();
}
--- a/cmmanager/cmmgr/cmmplugins/cmpluginvpn/data/10281BBE.rss Mon May 24 20:51:35 2010 +0300
+++ b/cmmanager/cmmgr/cmmplugins/cmpluginvpn/data/10281BBE.rss Thu May 27 11:12:59 2010 +0300
@@ -12,12 +12,10 @@
* Contributors:
*
* Description:
-* ECom resource descriptor for VPN plug-in
-*
-*
+* ECom resource descriptor for VPN plug-in
*/
-#include "ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
// Because attribute enums had to be added to namespace CMManager
// it's not possible to included cmpluginvpndef.h.
--- a/cmmanager/cmmgr/cmmplugins/cmpluginvpn/src/cmpluginvpnproxy.cpp Mon May 24 20:51:35 2010 +0300
+++ b/cmmanager/cmmgr/cmmplugins/cmpluginvpn/src/cmpluginvpnproxy.cpp Thu May 27 11:12:59 2010 +0300
@@ -12,14 +12,12 @@
* Contributors:
*
* Description:
-* VPN plug-in's ECom proxy descriptor.
-*
-*
+* VPN plug-in's ECom proxy descriptor.
*/
#include "cmpluginvpn.h"
#include <e32std.h>
-#include <ecom/ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
// Exported proxy for instantiation method resolution
// Define the interface UIDs
--- a/connectionutilities/ConnectionDialogs/DisconnectDlg/src/DisconnectDlgDialog.cpp Mon May 24 20:51:35 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/DisconnectDlg/src/DisconnectDlgDialog.cpp Thu May 27 11:12:59 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 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"
@@ -12,8 +12,7 @@
* Contributors:
*
* Description:
-* Defines the pop-up selection list with the active connections.
-*
+* Defines the pop-up selection list with the active connections.
*/
@@ -26,7 +25,7 @@
#include "ConnectionDialogsLogger.h"
#include "ExpiryTimer.h"
-#include <DisconnectDlg.rsg>
+#include <disconnectdlg.rsg>
#include <AknIconArray.h>
#include <StringLoader.h>
#include <uikon/eiksrvui.h>
@@ -222,19 +221,17 @@
TInt result = iConnModel->EndConnection( toBeClosedItem );
iDisconnectDialogUi->iDialogRun = EFalse;
if ( result )
- {
- TInt resId = R_QTN_CMON_INFO_CONN_ALREADY_END;
+ {
if( KNullUnit == result )
{
result = KErrNone;
}
else
- {
- resId = R_QTN_NETW_INFO_DISCONNECT_FAILED;
+ {
+ iConnModel->InfoNoteL( R_QTN_NETW_INFO_DISCONNECT_FAILED );
result = KErrGeneral;
}
-
- iConnModel->InfoNoteL( resId );
+
iDisconnectDialogUi->CompleteL( result );
}
}
--- a/connectionutilities/ConnectionDialogs/group/bld.inf Mon May 24 20:51:35 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/group/bld.inf Thu May 27 11:12:59 2010 +0300
@@ -27,7 +27,6 @@
// export iby files
../rom/agentdialog.iby CORE_MW_LAYER_IBY_EXPORT_PATH(agentdialog.iby)
../rom/cconndlg.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cconndlg.iby)
-../rom/cconndlgResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(cconndlgResources.iby)
../rom/ConnectionDialogs.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ConnectionDialogs.iby)
--- a/connectionutilities/ConnectionDialogs/rom/cconndlgResources.iby Mon May 24 20:51:35 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-#ifndef __CCONNDLGRESOURCES_IBY__
-#define __CCONNDLGRESOURCES_IBY__
-
-data=DATAZ_\RESOURCE_FILES_DIR\CConndlgplugin.rsc RESOURCE_FILES_DIR\CConndlgplugin.rsc
-
-#endif
\ No newline at end of file
--- a/ipcm_plat/commsdat_wlan_api/inc/cmmanagertablefields.h Mon May 24 20:51:35 2010 +0300
+++ b/ipcm_plat/commsdat_wlan_api/inc/cmmanagertablefields.h Thu May 27 11:12:59 2010 +0300
@@ -23,9 +23,9 @@
// INCLUDES
#include <e32base.h>
-#include <Metadatabase.h>
+#include <metadatabase.h>
#include <WlanCdbCols.h>
-#include <CommsDatTypesV1_1.h>
+#include <commsdattypesv1_1.h>
using namespace CommsDat;
--- a/ipcm_plat/commsdat_wlan_api/inc/wlancontainer.h Mon May 24 20:51:35 2010 +0300
+++ b/ipcm_plat/commsdat_wlan_api/inc/wlancontainer.h Thu May 27 11:12:59 2010 +0300
@@ -23,8 +23,8 @@
// INCLUDES
#include <e32base.h>
-#include <Metadatabase.h>
-#include <CommsDatTypesV1_1.h>
+#include <metadatabase.h>
+#include <commsdattypesv1_1.h>
#include <cmmanagertablefields.h>
// FORWARD DECLARATIONS
--- a/keepalive/flextimer/server/engine/traces/OstTraceDefinitions.h Mon May 24 20:51:35 2010 +0300
+++ b/keepalive/flextimer/server/engine/traces/OstTraceDefinitions.h Thu May 27 11:12:59 2010 +0300
@@ -1,4 +1,21 @@
+/*
+* Copyright (c) 2010 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:
+* OST trace definition header.
+*/
+
#ifndef __OSTTRACEDEFINITIONS_H__
#define __OSTTRACEDEFINITIONS_H__
-#include <OpenSystemTrace.h>
+#include <opensystemtrace.h>
#endif