--- 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 )
--- 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") );
--- 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
--- 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
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="imsrv" name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
- <collection id="imservices" name="IM Services" level="generic">
- <component id="imfeatureplugin" filter="s60" name="IM Feature Plugin" class="plugin" introduced="^2">
- <unit bldFile="imservices/imfeatureplugin/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/imfeatureplugin/srcimdatamodel/group"/> -->
- <!-- <unit bldFile="imservices/imfeatureplugin/srcimfrontend/group"/> -->
- <!-- <unit bldFile="imservices/imfeatureplugin/srcimoperations/group"/> -->
- <!-- <unit bldFile="imservices/imfeatureplugin/srcimprocessor/group"/> -->
- </component>
- <component id="searchfeatureplugin" filter="s60" name="Search Feature Plugin" class="plugin" introduced="^2">
- <unit bldFile="imservices/searchfeatureplugin/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/searchfeatureplugin/srcsearchdatamodel/group"/> -->
- <!-- <unit bldFile="imservices/searchfeatureplugin/srcsearchfrontend/group"/> -->
- <!-- <unit bldFile="imservices/searchfeatureplugin/srcsearchoperations/group"/> -->
- <!-- <unit bldFile="imservices/searchfeatureplugin/srcsearchprocessor/group"/> -->
- </component>
- <component id="xmppsettingsapi" filter="s60" name="XMPP Settings API" introduced="^2">
- <unit bldFile="imservices/xmppsettingsapi/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/xmppsettingsapi/tsrc/group"/> -->
- </component>
- <component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
- <unit bldFile="imservices/xmppsettingsfetcher/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/xmppsettingsfetcher/tsrc/xmppsettingsfetchermt/group"/> -->
- </component>
- <component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
- <unit bldFile="imservices/ossprotocoladaptation/group"/>
- <!-- <unit bldFile="imservices/ossprotocoladaptation/dataconvlib/group"/> -->
- <!-- should #include the test bld.infs if needed -->
- <!-- <unit bldFile="imservices/ossprotocoladaptation/tsrc/ossadapmt/group"/> -->
- </component>
- <component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
- <unit bldFile="imservices/instantmessagingcache/group"/>
- <!-- should #include the test bld.inf if needed -->
- <!-- <unit bldFile="imservices/instantmessagingcache/tsrc/group"/> -->
- </component>
- <component id="imservices_build" filter="s60" name="IM Services Build" introduced="^2">
- <unit bldFile="imservices/group"/>
- </component>
- </collection>
- <collection id="ximpfw" name="XIMP Framework" level="framework">
- <component id="ximpfw_core" filter="s60" name="XIMP Core">
- <!-- <unit bldFile="ximpfw/core/group"/> -->
- </component>
- <component id="presence" filter="s60" name="XIMP Presence">
- <!-- <unit bldFile="ximpfw/presence/group"/> -->
- </component>
- <component id="ximpfw_test" filter="s60" name="XIMP Framework Test" purpose="development">
- <!-- should these all be included in a single test bld.inf? -->
- <!-- <unit bldFile="ximpfw/tsrc/group"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencewatching"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencegroupmembermngt"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presenceblocking"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/tsrcutils"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_rootservices"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presenceall"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencegrouplistmngt"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencecache"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencepublishing"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencewatcherlistmngt"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/tsrcprotocols"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presencegrantrequestmngt"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_sessionmng"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_presenceauthorization"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_eunittemplate"/> -->
- <!-- <unit bldFile="ximpfw/tsrc/src/t_utils"/> -->
- </component>
- </collection>
- <collection id="brandingserver" name="Branding Server" level="specific">
- <component id="tools" filter="s60" name="Branding Server Tools">
- <!-- is this component needed? Can it be #included by the below bld.inf if it is? -->
- <!-- <unit bldFile="brandingserver/tools/bsimport/group"/> -->
- </component>
- <component id="brandingserver_build" filter="s60" name="Branding Server Build">
- <unit bldFile="brandingserver/group"/>
- </component>
- </collection>
- <collection id="imsrv_info" name="Instant Messaging and Presence Services Info" level="specific">
- <component id="imsrv_plat" filter="s60" name="Instant Messaging and Presence Services Platform Interfaces" class="api">
- <unit bldFile="imsrv_plat/group"/>
- <!-- should #include these tests in the above bld.inf -->
- <!-- <unit bldFile="imsrv_plat/im_cache_client_api/tsrc/group"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/group"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_eunittemplate"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceall"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceauthorization"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presenceblocking"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencecache"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrantrequestmngt"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegrouplistmngt"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencegroupmembermngt"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencepublishing"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatcherlistmngt"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_presencewatching"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_rootservices"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_sessionmng"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/src/t_utils"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcprotocols/pr_prfwtestprotocol"/> -->
- <!-- <unit bldFile="imsrv_plat/ximp_core_feature_plugin_api/tsrc/tsrcutils"/> -->
- <!-- <unit bldFile="imsrv_plat/xmpp_settings_api/tsrc/group"/> -->
- </component>
- </collection>
- </package>
-</SystemDefinition>