# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1270062352 -10800 # Node ID e1ad3c803639198f8989441f43bd20a8948e6411 # Parent 0b696286a1b2f585506070e5dff8740847ac14e4 Revision: 201011 Kit: 201013 diff -r 0b696286a1b2 -r e1ad3c803639 brandingserver/bsserver/cbssession.cpp --- a/brandingserver/bsserver/cbssession.cpp Mon Mar 15 12:41:57 2010 +0200 +++ b/brandingserver/bsserver/cbssession.cpp Wed Mar 31 22:05:52 2010 +0300 @@ -72,6 +72,10 @@ delete iBuffer; delete iBranding; delete iSeveralData; + + delete iApplicationId; + delete iBrandId; + delete iDefaultBrandId; #ifdef __WINSCW__ if( iStorageManager ) diff -r 0b696286a1b2 -r e1ad3c803639 imservices/instantmessagingcache/imcacheserver/src/ccacheserveractivehelper.cpp --- a/imservices/instantmessagingcache/imcacheserver/src/ccacheserveractivehelper.cpp Mon Mar 15 12:41:57 2010 +0200 +++ b/imservices/instantmessagingcache/imcacheserver/src/ccacheserveractivehelper.cpp Wed Mar 31 22:05:52 2010 +0300 @@ -430,7 +430,37 @@ { iActiveHeader = NULL; } - + // remove the universal indicator notification if there are no more unread messages, + // apart form whose conversation is closed. loop through + TInt headerCount = iHeaderArray.Count(); + headerIndex = KErrNotFound; + for( TInt i=0; i< headerCount; i++ ) + { + // note in this case reciepient is own user id + MIMCacheMessageHeader* header = iHeaderArray[i]; + TRACE(T_LIT( "CCacheServerActiveHelper::PublishMessageInfoL UnreadMessageCount -- %d"), header->UnreadMessageCount()); + if( header->ServiceId() == sericeId && header->UnreadMessageCount() ) + { + // this is required in the following scenario + // you receive 10 new messgaes form two parties(5, each) + // whne you close the conversation form one, the universal indicator is still + // for the other party's messages, and when clicked on universal indicator it should + // open the conversation view wiht the latest user id. + headerIndex = i; + } + } + // there are new messages received form only one party. + // hence the buddyid is required as conversation view will be openend. + if(KErrNone == headerIndex) + { + PublishMessageInfoL(iHeaderArray[headerIndex]->BuddyId(), sericeId); + } + // new messages are recieved from multiple parties, hence no need of the sender id + // as the service tab will be opened. + else + { + PublishMessageInfoL(KNullDesC(), sericeId); + } PackAndNotifyEventL( EIMOperationChatDeleted, sericeId, msgHeader, NULL ); delete msgHeader; @@ -469,6 +499,10 @@ } if( needToNotify ) { + // remove the universal indicator notification if there it was displayed, + // as when you logout all the ocnversations are removed. + PublishMessageInfoL(KNullDesC(), aServiceId); + PackAndNotifyEventL( EIMOperationAllChatDeleted, aServiceId, NULL, NULL ); } TRACE( T_LIT( "CCacheServerActiveHelper::CloseAllConversationL End") ); diff -r 0b696286a1b2 -r e1ad3c803639 imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt --- a/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Mon Mar 15 12:41:57 2010 +0200 +++ b/imservices/xmppsettingsapi/tsrc/group/xmppsettings_api_DoxyFile.txt Wed Mar 31 22:05:52 2010 +0300 @@ -1,8 +1,9 @@ -# -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +#/*TYPE TESTCLASS*/ +#/* +#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 the License "Eclipse Public License v1.0" +# 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". # @@ -11,9 +12,10 @@ # # Contributors: # -# Description: +# Description: MMP file for STIF Test Framework's TestScripter +# testclass test module. # -# +#*/ # Doxyfile 1.4.1 diff -r 0b696286a1b2 -r e1ad3c803639 imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt --- a/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Mon Mar 15 12:41:57 2010 +0200 +++ b/imsrv_plat/xmpp_settings_api/tsrc/group/xmppsettings_api_DoxyFile.txt Wed Mar 31 22:05:52 2010 +0300 @@ -1,4 +1,6 @@ -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +#/*TYPE TESTCLASS*/ +#/* +#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" @@ -13,7 +15,7 @@ # Description: MMP file for STIF Test Framework's TestScripter # testclass test module. # -# +#*/ # Doxyfile 1.4.1 diff -r 0b696286a1b2 -r e1ad3c803639 package_definition.xml --- a/package_definition.xml Mon Mar 15 12:41:57 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -