Mercurial Mercurial > oss > FCL > sf > os > devicesrv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: 201037
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 17 Sep 2010 08:36:42 +0300
changeset 69 dc67b94625c5
parent 63 09d657f1ee00
child 74 9d35fd98f273
Revision: 201037 Kit: 201037
accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp file | annotate | diff | comparison | revisions
devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericid.h file | annotate | diff | comparison | revisions
devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericidArray.h file | annotate | diff | comparison | revisions
resourcemgmt/hwresourcesmgr/server/src/HWRMFmTxRdsTextConverter.cpp file | annotate | diff | comparison | revisions
sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmlocaleobserversup.cpp file | annotate | diff | comparison | revisions
sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp file | annotate | diff | comparison | revisions
sysstatemgmt/systemstatemgr/cle/src/clecli.cpp file | annotate | diff | comparison | revisions
sysstatemgmt/systemstatemgr/ssm/src/ssmswppolicycli.cpp file | annotate | diff | comparison | revisions 
--- a/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp	Thu Sep 02 21:48:26 2010 +0300
+++ b/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommsService.cpp	Fri Sep 17 08:36:42 2010 +0300
@@ -152,8 +152,12 @@
         {
         delete iZeroObserver;
         }
+	
+	iAsyComms.CloseSubSession();
+	iServer.Disconnect();
+	iServer.Close();
     
-    COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommsService::~CASYProxyCommsService" );
+	COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommsService::~CASYProxyCommsService" );
     }
 
 // -----------------------------------------------------------------------------
--- a/devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericid.h	Thu Sep 02 21:48:26 2010 +0300
+++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericid.h	Fri Sep 17 08:36:42 2010 +0300
@@ -25,8 +25,8 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include <accpolgidheader.h> 
-#include <accpolgenericiddefinitions.h>
+#include <AccPolGIDHeader.h> 
+#include <AccPolGenericIdDefinitions.h>
 
 // CONSTANTS
 
--- a/devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericidArray.h	Thu Sep 02 21:48:26 2010 +0300
+++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccPolGenericidArray.h	Fri Sep 17 08:36:42 2010 +0300
@@ -23,7 +23,7 @@
 #define ACCPOLGENERICIDARRAY_H
 
 //  INCLUDES
-#include <accpolgenericid.h>
+#include <AccPolGenericID.h>
 
 // CONSTANTS
 // Maximum amount of Generic ID -instances that an array can contain.
--- a/resourcemgmt/hwresourcesmgr/server/src/HWRMFmTxRdsTextConverter.cpp	Thu Sep 02 21:48:26 2010 +0300
+++ b/resourcemgmt/hwresourcesmgr/server/src/HWRMFmTxRdsTextConverter.cpp	Fri Sep 17 08:36:42 2010 +0300
@@ -101,6 +101,7 @@
     {
     COMPONENT_TRACE1( _L( "HWRM Server - CHWRMFmTxRdsTextConverter::~CHWRMFmTxRdsTextConverter()" ) );
 
+	iConvertFromUnicodeFile.Close();
     iFileServer.Close();
 
     COMPONENT_TRACE1( _L( "HWRM Server - CHWRMFmTxRdsTextConverter::~CHWRMFmTxRdsTextConverter - return" ) );
--- a/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmlocaleobserversup.cpp	Thu Sep 02 21:48:26 2010 +0300
+++ b/sysstatemgmt/ssmutilityplugins/ssmlocaleobserversup/src/ssmlocaleobserversup.cpp	Fri Sep 17 08:36:42 2010 +0300
@@ -517,6 +517,7 @@
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangHebrew,              ERegISR ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangHindi,               ERegIND ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangIndonesian,          ERegIDN ) );
+	iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangKorean,          	  ERegKOR ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangLatvian,             ERegLVA ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangLithuanian,          ERegLTU ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangMalay,               ERegMYS ) );
--- a/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp	Thu Sep 02 21:48:26 2010 +0300
+++ b/sysstatemgmt/syslangutil/ssmlangselcmd/src/ssmlangselcmd.cpp	Fri Sep 17 08:36:42 2010 +0300
@@ -235,6 +235,7 @@
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangHebrew,              ERegISR ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangHindi,               ERegIND ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangIndonesian,          ERegIDN ) );
+	iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangKorean,          	  ERegKOR ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangLatvian,             ERegLVA ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangLithuanian,          ERegLTU ) );
     iLangRegionMappingHashSet.InsertL( TLanguageRegion( ELangMalay,               ERegMYS ) );
--- a/sysstatemgmt/systemstatemgr/cle/src/clecli.cpp	Thu Sep 02 21:48:26 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/cle/src/clecli.cpp	Fri Sep 17 08:36:42 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -42,10 +42,16 @@
 		User::Leave( KErrAlreadyExists );
 		}
 
-	const TInt err = CreateSession(KCleSrvName, iVersion, KCleSrvMsgSlots);
+	TInt err = CreateSession(KCleSrvName, iVersion, KCleSrvMsgSlots);
 	if( (KErrNotFound == err) || (KErrServerTerminated == err) )
 		{
-		User::LeaveIfError( CCleServer::StartCleSrv(KCleSrvName) );
+		err = CCleServer::StartCleSrv(KCleSrvName);
+		DEBUGPRINT2(_L("Starting CleSrv completed with %d"),err);
+		if (KErrNone !=  err && KErrAlreadyExists != err)
+			{
+			User::Leave(err);
+			}
+
 		User::LeaveIfError( CreateSession(KCleSrvName, iVersion, KCleSrvMsgSlots) );
 		}
 	else
@@ -70,10 +76,17 @@
 		User::Leave( KErrAlreadyExists );
 		}
 
-	const TInt err = CreateSession(aServerName, iVersion, KCleSrvMsgSlots);
+	TInt err = CreateSession(aServerName, iVersion, KCleSrvMsgSlots);
 	if( (KErrNotFound == err) || (KErrServerTerminated == err) )
 		{
-		User::LeaveIfError( CCleServer::StartCleSrv(aServerName) );
+		err = CCleServer::StartCleSrv(aServerName);
+
+		DEBUGPRINT2(_L("Starting CleSrv completed with %d"),err);
+		if (KErrNone !=  err && KErrAlreadyExists != err)
+			{
+			User::Leave(err);
+			}
+
 		User::LeaveIfError( CreateSession(aServerName, iVersion, KCleSrvMsgSlots) );
 		}
 	else
--- a/sysstatemgmt/systemstatemgr/ssm/src/ssmswppolicycli.cpp	Thu Sep 02 21:48:26 2010 +0300
+++ b/sysstatemgmt/systemstatemgr/ssm/src/ssmswppolicycli.cpp	Fri Sep 17 08:36:42 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -41,10 +41,17 @@
 		User::Leave(KErrAlreadyExists);
 		}
 
-	const TInt err = CreateSession(KSsmSwpPolicySrvName, iVersion, KSsmSwpPolicySrvMsgSlots);
+	TInt err = CreateSession(KSsmSwpPolicySrvName, iVersion, KSsmSwpPolicySrvMsgSlots);
 	if((KErrNotFound == err) || (KErrServerTerminated == err))
 		{
-		User::LeaveIfError(CSsmSwpPolicyServer::StartSsmSwpPolicySrv(KSsmSwpPolicySrvName));
+		err = CSsmSwpPolicyServer::StartSsmSwpPolicySrv(KSsmSwpPolicySrvName);
+
+		DEBUGPRINT2(_L("Starting SsmSwpPolicySrv completed with %d"),err);
+		if (KErrNone !=  err && KErrAlreadyExists != err)
+			{
+			User::Leave(err);
+			}
+
 		User::LeaveIfError(CreateSession(KSsmSwpPolicySrvName, iVersion, KSsmSwpPolicySrvMsgSlots));
 		DEBUGPRINT1(_L("RSsmSwpPolicySession Connect Completed with KErrNone"));
 		}
@@ -72,10 +79,17 @@
 		User::Leave(KErrAlreadyExists);
 		}
 
-	const TInt err = CreateSession(aServerName, iVersion, KSsmSwpPolicySrvMsgSlots);
+	TInt err = CreateSession(aServerName, iVersion, KSsmSwpPolicySrvMsgSlots);
 	if((KErrNotFound == err) || (KErrServerTerminated == err))
 		{
-		User::LeaveIfError(CSsmSwpPolicyServer::StartSsmSwpPolicySrv(aServerName));
+		err = CSsmSwpPolicyServer::StartSsmSwpPolicySrv(aServerName);
+
+		DEBUGPRINT2(_L("Starting SsmSwpPolicySrv completed with %d"),err);
+		if (KErrNone !=  err && KErrAlreadyExists != err)
+			{
+			User::Leave(err);
+			}
+		
 		User::LeaveIfError(CreateSession(aServerName, iVersion, KSsmSwpPolicySrvMsgSlots));
 		DEBUGPRINT1(_L("RSsmSwpPolicySession Connect Completed with KErrNone"));
 		}
FCL/sf/os/devicesrv