Mercurial Mercurial > oss > MCL > sf > mw > imsrv / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
brandingserver/bsserver/cbssession.cpp
branchRCL_3
changeset 21 cfd5c2994f10
parent 16 cfe5eb8bb9ca
child 22 113b91e0a2ad
equal deleted inserted replaced
20:eedf17a17c27 21:cfd5c2994f10 
     1 /*
 
     1 /*
 
     2 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 
     2 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 
     3 * All rights reserved.
 
     3 * All rights reserved.
 
     4 * This component and the accompanying materials are made available
 
     4 * This component and the accompanying materials are made available
 
     5 * under the terms of "Eclipse Public License v1.0"
 
     5 * under the terms of the License "Eclipse Public License v1.0"
 
     6 * which accompanies this distribution, and is available
 
     6 * which accompanies this distribution, and is available
 
     7 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 
     7 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 
     8 *
 
     8 *
 
     9 * Initial Contributors:
 
     9 * Initial Contributors:
 
    10 * Nokia Corporation - initial contribution.
 
    10 * Nokia Corporation - initial contribution.
 
    11 *
 
    11 *
 
    12 * Contributors:
 
    12 * Contributors:
 
    13 *
 
    13 *
 
    14 * Description: CBSSession.cpp
 
    14 * Description:  CBSSession.cpp
 
    15 *
 
    15 *
 
    16 */
 
    16 */
 
       
    17 
    17 
    18 
    18 
    19 
    19 //  INCLUDE FILES
 
    20 //  INCLUDE FILES
 
    20 #include <e32base.h>
 
    21 #include <e32base.h>
 
    21 #include <apgcli.h>
 
    22 #include <apgcli.h>
 
    22 
    23 
    23 #include "cbssession.h"
 
    24 #include "cbssession.h"
 
    24 #include "cbsserver.h"
 
    25 #include "cbsserver.h"
 
    25 #include "debugtrace.h"
 
    26 #include "DebugTrace.h"
 
    26 #include "cbsbrandhandler.h"
 
    27 #include "cbsbrandhandler.h"
 
    27 #include "cbsstoragemanager.h"
 
    28 #include "cbsstoragemanager.h"
 
    28 #include "cbsstorage.h"
 
    29 #include "cbsstorage.h"
 
    29 #include "cbsbitmap.h"
 
    30 #include "cbsbitmap.h"
 
    30 //#include "cbselement.h"
 
    31 //#include "cbselement.h"
 
    70         }
 
    71         }
 
    71 	delete iText;
 
    72 	delete iText;
 
    72 	delete iBuffer;
 
    73 	delete iBuffer;
 
    73 	delete iBranding;
 
    74 	delete iBranding;
 
    74 	delete iSeveralData;
 
    75 	delete iSeveralData;
 
    75 
       
    76 	delete iApplicationId;
 
       
    77 	delete iBrandId;
 
       
    78 	delete iDefaultBrandId;
 
       
    79 	
    76 	
    80 #ifdef __WINSCW__
 
    77 #ifdef __WINSCW__
 
    81 	if( iStorageManager )
 
    78 	if( iStorageManager )
 
    82 		{
 
    79 		{
 
    83 		iStorageManager->WriteIbyFiles();
 
    80 		iStorageManager->WriteIbyFiles();
 
   509 		
   506 		
   510 		if(brandDiscarded)
 
   507 		if(brandDiscarded)
 
   511 		{
 
   508 		{
 
   512 			TRACE( T_LIT("CBSSession::InitUpdateL: Brand discarded!->LeaveWith KErrNotFound") );
 
   509 			TRACE( T_LIT("CBSSession::InitUpdateL: Brand discarded!->LeaveWith KErrNotFound") );
 
   513 			///Server()->DisplaySessionInfoL( this, KErrNotFound );
 
   510 			///Server()->DisplaySessionInfoL( this, KErrNotFound );
 
   514 			//User::Leave( KErrNotFound );	
   511 			User::Leave( KErrNotFound );	
   515 			iBrandId->Des().Copy( *iDefaultBrandId );
 
       
   516 		}
 
   512 		}
 
   517 	}
 
   513 	}
 
   518 
   514 
   519 	if( aType == EBSTxAppend )
 
   515 	if( aType == EBSTxAppend )
 
   520 		{
 
   516 		{
MCL/sf/mw/imsrv