# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1274783891 -10800
# Node ID 1aa6688bfd6b7e68e33ad6488a664857a5587635
# Parent  ea43c23d28d2170999064d761c415a0f1e07fec7
Revision: 201019
Kit: 2010121

diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/group/sapiincludes.mmpi
--- a/serviceproviders/group/sapiincludes.mmpi	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/group/sapiincludes.mmpi	Tue May 25 13:38:11 2010 +0300
@@ -12,8 +12,8 @@
 * Contributors:
 *
 * Description: 	Sapi include path dependencies.
-*	%created_by:	slathia %
-*	%date_created:	Sat Oct 31 14:39:55 2009 %
+*	%created_by:	shreedha %
+*	%date_created:	Wed May 12 09:52:12 2010 %
 *  Copyright © 2006-2007 Nokia.  All rights reserved.
 *  This material, including documentation and any related computer
 *  programs, is protected by copyright controlled by Nokia.  All
@@ -32,7 +32,7 @@
 #include <platform_paths.hrh>
 SYSTEMINCLUDE /epoc32/include/icl
 SYSTEMINCLUDE /epoc32/include/libc
-
+SYSTEMINCLUDE /epoc32/include/mmf/common
 APP_LAYER_SYSTEMINCLUDE
 
 
diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/sapi_calendar/calendarservice/src/calendarimport.cpp
--- a/serviceproviders/sapi_calendar/calendarservice/src/calendarimport.cpp	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarimport.cpp	Tue May 25 13:38:11 2010 +0300
@@ -24,7 +24,7 @@
 #include <CalenInterimUtils2.h>
 #include <s32mem.h>
 #include <s32file.h>
-
+#include <mmfcontrollerpluginresolver.h>
 //User Include
 #include "calendarheader.h"
 #include "calendarconstants.h"
@@ -147,6 +147,7 @@
 //	
 void CCalendarImport::ImportFromStreamL(RReadStream& aStream,  RPointerArray<TUIDSet>& aOutputUIDArray )
 	{
+	CleanupResetAndDestroyPushL(aOutputUIDArray);
 	RPointerArray<CCalEntry> outputCalEntryArray;
 
 	CleanupStack::PushL( TCleanupItem(CleanupCCalEntryArray, &outputCalEntryArray) );
@@ -182,6 +183,7 @@
 		}
 	
 	CleanupStack::PopAndDestroy( &outputCalEntryArray );
+	CleanupStack::Pop(&aOutputUIDArray);
 	}
 	
 
diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontactfield.cpp
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontactfield.cpp	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontactfield.cpp	Tue May 25 13:38:11 2010 +0300
@@ -18,7 +18,7 @@
 
 #include <MVPbkFieldType.h>
 #include <MVPbkContactFieldTextData.h>
-
+#include <mmfcontrollerpluginresolver.h>
 #include "singlecontact.h"
 #include "singlecontactfield.h"
 
@@ -143,6 +143,7 @@
 
 EXPORT_C void CSingleContactField::GetUriFieldParamL(RPointerArray<HBufC>& axspidArray)
     {
+    CleanupResetAndDestroyPushL(axspidArray);
     TInt count = iidArray.Count();
     if(count != 0)
             {
@@ -155,7 +156,8 @@
         else
             {
             User::Leave(KErrNotFound);    
-            }       
+            }   
+    CleanupStack::Pop(&axspidArray);     
 	}
 
 //Gets the Group Data and returns them as output parameters
@@ -233,6 +235,7 @@
 
 EXPORT_C void CSingleContactField::GetXspidDataL(RPointerArray<HBufC>& axspidArray)
     {
+    CleanupResetAndDestroyPushL(axspidArray);
     TInt count = iArrayValue.Count();
     if(count != 0)
             {
@@ -247,7 +250,8 @@
         else
             {
             User::Leave(KErrNotFound);    
-            }       
+            } 
+    CleanupStack::Pop(&axspidArray);       
     }
 CSingleContactField::~CSingleContactField()
     {
diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp	Tue May 25 13:38:11 2010 +0300
@@ -23,7 +23,7 @@
 #include <StifParser.h>
 #include <StifTestInterface.h>
 #include <VPbkEng.rsg>
-
+#include <mmfcontrollerpluginresolver.h>
 #include <MVPbkContactFieldTextData.h>
 #include <MVPbkContactStoreList.h>
 #include <MVPbkContactOperationBase.h>
@@ -740,7 +740,8 @@
     
 //Check for contact
 void CContactsUT::CheckContactsL(TInt& aCount,RPointerArray<TDesC8>& aIdArray)
-    {    
+    { 
+    CleanupResetAndDestroyPushL(aIdArray);   
     // Print to UI
     _LIT( KContactsTest, "ContactsUT" );
     _LIT( KExample, "In CheckContactsL" );
@@ -766,7 +767,8 @@
         }
     delete iFindResults;
     iFindResults = NULL;
-   // __UHEAP_MARKENDC(aCount);          
+   // __UHEAP_MARKENDC(aCount);
+   CleanupStack::Pop(&aIdArray);          
     }
     
 // -----------------------------------------------------------------------------
diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp	Tue May 25 13:38:11 2010 +0300
@@ -23,7 +23,7 @@
 #include <StifParser.h>
 #include <StifTestInterface.h>
 #include <VPbkEng.rsg>
-
+#include <mmfcontrollerpluginresolver.h>
 #include <MVPbkContactFieldTextData.h>
 #include <MVPbkContactStoreList.h>
 #include <MVPbkContactOperationBase.h>
@@ -582,7 +582,8 @@
     
 //Check for contact
 void CContactsUT::CheckContactsL(TInt& aCount,RPointerArray<TDesC8>& aIdArray)
-    {    
+    {  
+    CleanupResetAndDestroyPushL(aIdArray);  
     // Print to UI
     _LIT( KContactsTest, "ContactsUT" );
     _LIT( KExample, "In CheckContactsL" );
@@ -608,7 +609,8 @@
         }
     delete iFindResults;
     iFindResults = NULL;
-   // __UHEAP_MARKENDC(aCount);          
+   // __UHEAP_MARKENDC(aCount);   
+   CleanupStack::Pop(&aIdArray);       
     }
     
 // -----------------------------------------------------------------------------
diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp	Tue May 25 13:38:11 2010 +0300
@@ -19,6 +19,7 @@
 
 #include <MCLFItem.h>
 #include "mgpostfilter.h"
+#include <mmfcontrollerpluginresolver.h>
 
 const TInt32 KLargestSigned32 = 0x7fffffff;
 const TInt64 KLargestSigned64 = 0x7fffffffffffffff;
@@ -55,6 +56,7 @@
                                 RPointerArray<MCLFItem>& aFilteredItemList )
     {
 	// It will filter the Items
+	CleanupResetAndDestroyPushL(aFilteredItemList);
 	MCLFItem* item = NULL;
 
     for( TInt i = 0 ; i < aItemList.Count() ; ++i )
@@ -67,6 +69,7 @@
             aFilteredItemList.AppendL( item );
             }
         }
+        CleanupStack::Pop(&aFilteredItemList);
 	}
 
 // -----------------------------------------------------------------------------
diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/src/mgpostfilter.cpp
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/src/mgpostfilter.cpp	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/src/mgpostfilter.cpp	Tue May 25 13:38:11 2010 +0300
@@ -20,7 +20,7 @@
 
 #include <mclfitem.h>
 #include "mgpostfilter.h"
-
+#include <mmfcontrollerpluginresolver.h>
 const TInt32 KLargestSigned32 = 0x7fffffff;
 const TInt64 KLargestSigned64 = 0x7fffffffffffffff;
 
@@ -55,6 +55,7 @@
 void CPostFilter::FilterItemsL( const TArray<MCLFItem*>& aItemList,
                                 RPointerArray<MCLFItem>& aFilteredItemList )
     {
+    	CleanupResetAndDestroyPushL(aFilteredItemList);
 	// It will filter the Items
 	MCLFItem* item = NULL;
 
@@ -68,6 +69,7 @@
             aFilteredItemList.AppendL( item );
             }
         }
+        CleanupStack::Pop(&aFilteredItemList);
 	}
 
 // -----------------------------------------------------------------------------
diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp
--- a/serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp	Tue May 25 13:38:11 2010 +0300
@@ -59,7 +59,7 @@
 LIBRARY         smcm.lib
 LIBRARY         charconv.lib
 LIBRARY         mtur.lib
-
+LIBRARY		gsmu.lib
  
 
 paged
diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/sapi_messaging/messagingservice/inc/sendmessage.h
--- a/serviceproviders/sapi_messaging/messagingservice/inc/sendmessage.h	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/sapi_messaging/messagingservice/inc/sendmessage.h	Tue May 25 13:38:11 2010 +0300
@@ -21,10 +21,12 @@
 
 #include <rsendas.h>
 #include <rsendasmessage.h>
+#include <gsmumsg.h>
 
 class CMsvAttachment;
 class CRecipientList;
 class CMsgCallbackBase;
+class CSmsMessage;
 
 /**
  * This class provides functionality for sending SMS/MMS messages.
diff -r ea43c23d28d2 -r 1aa6688bfd6b serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp
--- a/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp	Tue May 11 17:01:36 2010 +0300
+++ b/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp	Tue May 25 13:38:11 2010 +0300
@@ -675,7 +675,20 @@
     CSmsHeader& smsHdr = clientMtm->SmsHeader();
     CSmsSettings* smsSetting = CSmsSettings::NewLC();
     smsSetting->CopyL(clientMtm->ServiceSettings());
+    TInt pdus;
+    TInt numberOfUnconvertedChars;
+    TInt numberOfDowngradedChars;
+    TInt freeUDUnitsInLastPDU;
+    CSmsMessage& smsMsg = smsHdr.Message();
+    smsMsg.GetEncodingInfoL(pdus, numberOfUnconvertedChars, numberOfDowngradedChars, freeUDUnitsInLastPDU );
+    if( numberOfUnconvertedChars || numberOfDowngradedChars )
+        {
     smsSetting->SetCharacterSet(TSmsDataCodingScheme::ESmsAlphabetUCS2);
+        }
+    else 
+        {
+        smsSetting->SetCharacterSet(TSmsDataCodingScheme::ESmsAlphabet7Bit);
+        }
     smsHdr.SetSmsSettingsL(*smsSetting);
     CleanupStack::PopAndDestroy(smsSetting);