dcmofw/dcmoserver/src/dcmoserver.cpp
changeset 73 ae69c2e8bc34
parent 51 2e64dc50f295
equal deleted inserted replaced
71:d2517372cc44 73:ae69c2e8bc34
   298 	TDCMOStatus err(EDcmoFail);
   298 	TDCMOStatus err(EDcmoFail);
   299 	TInt categotyNumber = GetLocalCategoryL(category);
   299 	TInt categotyNumber = GetLocalCategoryL(category);
   300 	if(categotyNumber != -1)
   300 	if(categotyNumber != -1)
   301 	{
   301 	{
   302 			RDEBUG("CDCMOServer::GetIntAttributeL(): LocalCategory");
   302 			RDEBUG("CDCMOServer::GetIntAttributeL(): LocalCategory");
   303 			CDCMOGenericControl* iGenericControl = new(ELeave) CDCMOGenericControl;
   303 			CDCMOGenericControl* genericControl = new(ELeave) CDCMOGenericControl;
   304 			err = iGenericControl->GetIntAttributeL(categotyNumber, id, value);
   304 			CleanupStack::PushL(genericControl);
   305 			delete iGenericControl;
   305 			err = genericControl->GetIntAttributeL(categotyNumber, id, value);
   306 			iGenericControl = NULL;
   306 			CleanupStack::PopAndDestroy(genericControl); //genericControl 	
   307 	}
   307 	}
   308 	else
   308 	else
   309 	{
   309 	{
   310 		RDEBUG("CDCMOServer::GetIntAttributeL(): Plug-in Adapter");
   310 		RDEBUG("CDCMOServer::GetIntAttributeL(): Plug-in Adapter");
   311 		TUid impluid = GetAdapterUidL(category);		
   311 		TUid impluid = GetAdapterUidL(category);		
   333 	TDCMOStatus err(EDcmoFail);
   333 	TDCMOStatus err(EDcmoFail);
   334 	TInt categotyNumber = GetLocalCategoryL(category);
   334 	TInt categotyNumber = GetLocalCategoryL(category);
   335 	if(categotyNumber != -1)
   335 	if(categotyNumber != -1)
   336 	{
   336 	{
   337 			RDEBUG("CDCMOServer::GetStrAttributeL(): LocalCategory");
   337 			RDEBUG("CDCMOServer::GetStrAttributeL(): LocalCategory");
   338 			CDCMOGenericControl* iGenericControl = new(ELeave) CDCMOGenericControl;
   338 			CDCMOGenericControl* genericControl = new(ELeave) CDCMOGenericControl;
   339 			err = iGenericControl->GetStrAttributeL(categotyNumber, id, strValue);	
   339 			CleanupStack::PushL(genericControl);
   340 			delete iGenericControl;
   340 			err = genericControl->GetStrAttributeL(categotyNumber, id, strValue);	
   341 			iGenericControl = NULL;
   341 			CleanupStack::PopAndDestroy(genericControl); //genericControl
   342 	}
   342 	}
   343 	else
   343 	else
   344 	{
   344 	{
   345 		RDEBUG("CDCMOServer::GetStrAttributeL(): Plug-in Adapter");
   345 		RDEBUG("CDCMOServer::GetStrAttributeL(): Plug-in Adapter");
   346 		TUid impluid = GetAdapterUidL(category);
   346 		TUid impluid = GetAdapterUidL(category);
   370 	TInt categotyNumber = GetLocalCategoryL(category);
   370 	TInt categotyNumber = GetLocalCategoryL(category);
   371 	struct dcmoInfoList dcmoList;
   371 	struct dcmoInfoList dcmoList;
   372 	if(categotyNumber != -1)
   372 	if(categotyNumber != -1)
   373 	{
   373 	{
   374 			RDEBUG("CDCMOServer::SetIntAttributeL(): LocalCategory");
   374 			RDEBUG("CDCMOServer::SetIntAttributeL(): LocalCategory");
   375 			CDCMOGenericControl* iGenericControl = new(ELeave) CDCMOGenericControl;
   375 			CDCMOGenericControl* genericControl = new(ELeave) CDCMOGenericControl;
   376 			err = iGenericControl->SetIntAttributeL(categotyNumber, id, value);	
   376 			CleanupStack::PushL(genericControl);
       
   377 			err = genericControl->SetIntAttributeL(categotyNumber, id, value);	
   377 			
   378 			
   378 			TBool result = HbTextResolverSymbian::Init(KdcmoResourceFileName, KdcmoResourceFilePath );					
   379 			TBool result = HbTextResolverSymbian::Init(KdcmoResourceFileName, KdcmoResourceFilePath );					
   379 
   380 
   380 			TPtrC buf;
   381 			TPtrC buf;
   381 			dcmoList.iUid = categotyNumber;
   382 			dcmoList.iUid = categotyNumber;
   387 			else
   388 			else
   388 			    {	
   389 			    {	
   389 					_LIT(KTextFOTA, "txt_device_update_info_firmware_update");
   390 					_LIT(KTextFOTA, "txt_device_update_info_firmware_update");
   390 					stringHolder = HbTextResolverSymbian::LoadL(KTextFOTA);
   391 					stringHolder = HbTextResolverSymbian::LoadL(KTextFOTA);
   391 			    }		
   392 			    }		
   392   	 delete iGenericControl;
   393   	 CleanupStack::PopAndDestroy(genericControl); //genericControl
   393 		 iGenericControl = NULL;
       
   394 	}
   394 	}
   395 	else
   395 	else
   396 	{
   396 	{
   397 		RDEBUG("CDCMOServer::SetIntAttributeL(): Plug-in Adapter");
   397 		RDEBUG("CDCMOServer::SetIntAttributeL(): Plug-in Adapter");
   398 		TUid impluid = GetAdapterUidL(category);
   398 		TUid impluid = GetAdapterUidL(category);