--- a/group/bld.inf	Tue Feb 02 10:12:21 2010 +0200
+++ b/group/bld.inf	Fri Apr 16 15:27:42 2010 +0300
@@ -16,6 +16,6 @@
 
 
 #include "../msgfw_plat/group/bld.inf"
-#include "../msgfw_pub/group/bld.inf"
+//#include "../msgfw_pub/group/bld.inf"
 #include "../msgbranched/group/bld.inf"
 #include "../messagingfw/group/bld.inf"

--- a/layers.sysdef.xml	Tue Feb 02 10:12:21 2010 +0200
+++ b/layers.sysdef.xml	Fri Apr 16 15:27:42 2010 +0300
@@ -7,7 +7,7 @@
   <systemModel>
     <layer name="mw_layer">
       <module name="messagingmw">
-        <unit unitID="MeCoDo.messagingmw" mrp="" bldFile="&layer_real_source_path;/group" name="messagingmw" />
+        <unit unitID="MeCo.messagingmw" mrp="" bldFile="&layer_real_source_path;/group" name="messagingmw" />
       </module>
     </layer>
   </systemModel>

--- a/messagingfw/alwaysonline/AlwaysOnlineManager/BMARM/alwaysonlinemanagerserveru.def	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/BMARM/alwaysonlinemanagerserveru.def	Fri Apr 16 15:27:42 2010 +0300
@@ -1,8 +1,5 @@
 EXPORTS
-	Connect__26RAlwaysOnlineClientSession @ 1 NONAME R3UNUSED ; RAlwaysOnlineClientSession::Connect(void)
-	RelayCommandL__26RAlwaysOnlineClientSession30TAlwaysOnlineServerAPICommandsR5TDes8 @ 2 NONAME R3UNUSED ; RAlwaysOnlineClientSession::RelayCommandL(TAlwaysOnlineServerAPICommands, TDes8 &)
-	RunServerL__Fv @ 3 NONAME R3UNUSED ; RunServerL(void)
-	Version__C26RAlwaysOnlineClientSession @ 4 NONAME R3UNUSED ; RAlwaysOnlineClientSession::Version(void) const
-	__26RAlwaysOnlineClientSession @ 5 NONAME R3UNUSED ; RAlwaysOnlineClientSession::RAlwaysOnlineClientSession(void)
-	SendSinglePacketL__26RAlwaysOnlineClientSession30TAlwaysOnlineServerAPICommandsR5TDes8 @ 6 NONAME R3UNUSED ; RAlwaysOnlineClientSession::SendSinglePacketL(TAlwaysOnlineServerAPICommands, TDes8 &)
+	NewL__26CAlwaysOnlineManagerServer @ 1 NONAME R3UNUSED ; CAlwaysOnlineManagerServer::NewL(void)
+	ThreadFunction__26CAlwaysOnlineManagerServerPv @ 2 NONAME R3UNUSED ; CAlwaysOnlineManagerServer::ThreadFunction(void *)
+	WinsMain__Fv @ 3 NONAME R3UNUSED ; WinsMain(void)
 

--- a/messagingfw/alwaysonline/AlwaysOnlineManager/group/AlwaysOnlineManagerServer.mmp	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/group/AlwaysOnlineManagerServer.mmp	Fri Apr 16 15:27:42 2010 +0300
@@ -35,7 +35,6 @@
 SOURCE          AOCenRepControl.cpp
 
 
-
 USERINCLUDE     ../inc
 SYSTEMINCLUDE   ../../../../inc
 MW_LAYER_SYSTEMINCLUDE
@@ -46,7 +45,7 @@
 LIBRARY         connmon.lib
 LIBRARY         efsrv.lib               // RFs
 LIBRARY         msgs.lib                // Message Server
-LIBRARY         muiu.lib
+LIBRARY         muiuutils.lib             
 LIBRARY         CentralRepository.lib   // Central Repository
 LIBRARY         CenRepNotifHandler.lib  // CenRep Notify Handler
 DEBUGLIBRARY    flogger.lib

--- a/messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManager.h	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManager.h	Fri Apr 16 15:27:42 2010 +0300
@@ -25,7 +25,7 @@
 #include <AlwaysOnlineManagerClient.h>
 #include <msvapi.h>
 #include <rconnmon.h>
-#include <app/MuiuMsvSingleOpWatcher.h>
+#include <MuiuMsvSingleOpWatcher.h>
 #include <centralrepository.h>
 #include <cenrepnotifyhandler.h>
 

--- a/messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManagerDiskSpaceObserver.h	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManagerDiskSpaceObserver.h	Fri Apr 16 15:27:42 2010 +0300
@@ -27,7 +27,7 @@
 
 // FORWARD DECLARATIONS
 class CAlwaysOnlineManager;
-
+class CMsvSession;
 // CLASS DECLARATION
 
 /**

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/inc/MuiuMsvSingleOpWatcher.h	Fri Apr 16 15:27:42 2010 +0300
@@ -0,0 +1,125 @@
+/*
+* Copyright (c) 2002 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     Messaging progress watching classes
+*
+*/
+
+
+
+
+#ifndef __MUIUMSVSINGLEOPWATCHER_H__
+#define __MUIUMSVSINGLEOPWATCHER_H__
+
+//  INCLUDES
+#include <e32base.h>
+#include <MSVSTD.H>
+
+
+// CONSTANTS
+const TInt KMsvSingleOpWatcherArrayGranularity = 4;
+
+
+// FORWARD DECLARATIONS
+class CMsvOperation;
+class MMsvSingleOpWatcher;
+
+
+
+// CLASS DECLARATION
+
+/**
+* CMsvOperation watcher class.
+*/
+class CMsvSingleOpWatcher : public CActive
+    {
+    public:
+        /**
+        * Two-phased constructor.
+        */
+        IMPORT_C static CMsvSingleOpWatcher* NewLC( MMsvSingleOpWatcher& aObserver );
+
+        /**
+        * Two-phased constructor.
+        */
+        IMPORT_C static CMsvSingleOpWatcher* NewL( MMsvSingleOpWatcher& aObserver );
+
+        /**
+        * Destructor
+        */
+        IMPORT_C ~CMsvSingleOpWatcher();
+
+        /**
+        * Sets operation
+        * Must only be called once during the lifetime of a CMsvSingleOpWatcher
+        * object.
+        */
+        IMPORT_C void SetOperation( CMsvOperation* aOperation );
+
+        /**
+        * Returns reference to the operation
+        */
+        IMPORT_C CMsvOperation& Operation() const;
+
+    private:
+        /**
+        * C++ constructor
+        */
+        CMsvSingleOpWatcher( MMsvSingleOpWatcher& aObserver );
+
+        /**
+        * Symbian OS constructor
+        */
+        void ConstructL();
+
+        /**
+        * From CActive
+        */
+        virtual void DoCancel();
+
+        /**
+        * From CActive
+        */
+        virtual void RunL();
+
+    private:
+        MMsvSingleOpWatcher& iObserver;
+        CMsvOperation *iOperation;
+    };
+
+
+/**
+* Mixin class MMsvSingleOpWatcher
+*
+* Function OpCompleted is called when operation is completed.
+*/
+class MMsvSingleOpWatcher
+    {
+    public:
+        virtual void OpCompleted( CMsvSingleOpWatcher& aOpWatcher, TInt aCompletionCode ) = 0;
+    };
+
+
+/**
+* Class CMsvSingleOpWatcherArray
+*
+* Use this define when we want to use an array of CMsvSingleOpWatcher objects.
+*/
+
+typedef CArrayPtrFlat<CMsvSingleOpWatcher> CMsvSingleOpWatcherArray;
+
+
+#endif // __MSVSINGLEOPWATCHER_H__
+
+// End of file

--- a/messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManagerDiskSpaceObserver.cpp	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManagerDiskSpaceObserver.cpp	Fri Apr 16 15:27:42 2010 +0300
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 #include <e32base.h>
-#include <app/MuiuMsvUiServiceUtilities.h>          // Muiu Utilities
+#include <MuiuServiceUtilities.h>          // Muiu Utilities
 #include <systemwarninglevels.hrh>
 
 #include "AlwaysOnlineManagerDiskSpaceObserver.h"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/src/MuiuMsvSingleOpWatcher.cpp	Fri Apr 16 15:27:42 2010 +0300
@@ -0,0 +1,117 @@
+/*
+* Copyright (c) 2002 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     Messaging progress watching classes
+*
+*/
+
+
+
+
+// INCLUDE FILES
+#include <MSVAPI.H>
+//#include "muiudomainpan.h"
+#include "MuiuMsvSingleOpWatcher.H"
+
+// CONSTANTS
+const TInt KSingleOpWatcherPriority = KMaxTInt;
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// ---------------------------------------------------------
+// CMsvSingleOpWatcher::NewLC
+//
+// ---------------------------------------------------------
+//
+EXPORT_C CMsvSingleOpWatcher* CMsvSingleOpWatcher::NewLC( MMsvSingleOpWatcher& aObserver )
+    {}
+
+
+// ---------------------------------------------------------
+// CMsvSingleOpWatcher::NewL
+//
+// ---------------------------------------------------------
+//
+EXPORT_C CMsvSingleOpWatcher* CMsvSingleOpWatcher::NewL( MMsvSingleOpWatcher& aObserver )
+    {}
+
+
+// ---------------------------------------------------------
+// CMsvSingleOpWatcher::CMsvSingleOpWatcher
+//
+// ---------------------------------------------------------
+//
+CMsvSingleOpWatcher::CMsvSingleOpWatcher( MMsvSingleOpWatcher& aObserver )
+    : CActive( KSingleOpWatcherPriority ), iObserver( aObserver )
+    {}
+
+
+// ---------------------------------------------------------
+// CMsvSingleOpWatcher::ConstructL
+//
+// ---------------------------------------------------------
+//
+void CMsvSingleOpWatcher::ConstructL()
+    {
+    // Nothing to do, reserved for future use...
+    }
+
+
+// ---------------------------------------------------------
+// CMsvSingleOpWatcher::~CMsvSingleOpWatcher
+//
+// ---------------------------------------------------------
+//
+EXPORT_C CMsvSingleOpWatcher::~CMsvSingleOpWatcher()
+    {}
+
+
+// ---------------------------------------------------------
+// CMsvSingleOpWatcher::SetOperation
+// --- Setter ---
+// Must only be called once during the lifetime of a CMsvSingleOpWatcher object.
+// ---------------------------------------------------------
+//
+EXPORT_C void CMsvSingleOpWatcher::SetOperation(CMsvOperation* aOperation)
+    {}
+
+
+// ---------------------------------------------------------
+// CMsvSingleOpWatcher::Operation
+// --- Accessor ---
+// ---------------------------------------------------------
+//
+EXPORT_C CMsvOperation& CMsvSingleOpWatcher::Operation() const
+    {}
+
+
+// ---------------------------------------------------------
+// CMsvSingleOpWatcher::DoCancel
+// --- From CActive ---
+// ---------------------------------------------------------
+//
+void CMsvSingleOpWatcher::DoCancel()        
+    {}
+
+
+//------------------------------------
+// CMsvSingleOpWatcher::RunL
+// --- From CActive ---
+// ---------------------------------------------------------
+//
+void CMsvSingleOpWatcher::RunL()
+    {}
+
+// End of file

--- a/messagingfw/alwaysonline/group/bld.inf	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/alwaysonline/group/bld.inf	Fri Apr 16 15:27:42 2010 +0300
@@ -26,11 +26,9 @@
 ../conf/alwaysonline_102071F2.crml     MW_LAYER_CRML(alwaysonline_102071F2.crml)
 
 ../rom/AlwaysOnline.iby                CORE_MW_LAYER_IBY_EXPORT_PATH(AlwaysOnline.iby)
-../rom/AlwaysOnlineEMailPlugin.iby     CORE_MW_LAYER_IBY_EXPORT_PATH(AlwaysOnlineEMailPlugin.iby)
-../rom/AlwaysOnlineEMailPluginRsc.iby  LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(AlwaysOnlineEMailPluginRsc.iby)
 
 // Stub installer file which enables eclipsing of always online manager
-../sis/aomanagerstub.SIS /epoc32/data/z/system/install/aomanager_stub.sis
+../sis/aomanagerstub.sis /epoc32/data/z/system/install/aomanagerstub.SIS
 
 PRJ_MMPFILES
 ../AlwaysOnlineManager/group/AlwaysOnlineManagerServer.mmp

--- a/messagingfw/alwaysonline/rom/AlwaysOnlineEMailPlugin.iby	Tue Feb 02 10:12:21 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: AlwaysOnline Email-plugin iby
-*
-*/
-#ifndef __ALWAYSONLINEEMAILPLUGIN_IBY__
-#define __ALWAYSONLINEEMAILPLUGIN_IBY__
-
-#ifdef __ALWAYS_ONLINE_EMAIL
-
-//ECOM_PLUGIN_UDEB(ALWAYSONLINEEMAILPLUGIN.DLL,AlwaysOnlineEmailPlugin.rsc)
-ECOM_PLUGIN(ALWAYSONLINEEMAILPLUGIN.DLL,AlwaysOnlineEmailPlugin.rsc)
-
-// Stub installer file
-data=DATAZ_\system\install\aoemailplugin_stub.sis   system\install\aoemailplugin_stub.sis
-
-#endif
-
-#endif

--- a/messagingfw/alwaysonline/rom/AlwaysOnlineEMailPluginRsc.iby	Tue Feb 02 10:12:21 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: AlwaysOnline Email-plugin resource iby
-*
-*/
-
-#ifndef __ALWAYSONLINEEMAILPLUGIN_RESOURCES_IBY__
-#define __ALWAYSONLINEEMAILPLUGIN_RESOURCES_IBY__
-
-#ifdef __ALWAYS_ONLINE_EMAIL
-  data=DATAZ_\RESOURCE_FILES_DIR\AlwaysOnlineEmailPluginData.rsc		RESOURCE_FILES_DIR\AlwaysOnlineEmailPluginData.rsc 
-#endif
-
-#endif

--- a/messagingfw/biomsgfw/BDB/group/BIODB.MMP	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BDB/group/BIODB.MMP	Fri Apr 16 15:27:42 2010 +0300
@@ -23,7 +23,7 @@
 TARGETTYPE      dll
 
 CAPABILITY All -TCB
-//TARGETPATH	\system\libs
+//TARGETPATH	/system/libs
 UID      0x10003C5E 0x10005542
 VENDORID 0x70000001
 SOURCEPATH	../../BDBSRC

--- a/messagingfw/biomsgfw/BITS/BITS.MMP	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BITS/BITS.MMP	Fri Apr 16 15:27:42 2010 +0300
@@ -16,7 +16,7 @@
 //
 
 TARGET        bits.dll
-//TARGETPATH    \system\libs
+//TARGETPATH    /system/libs
 TARGETTYPE    dll
 
 CAPABILITY All -TCB
@@ -38,7 +38,7 @@
 #ifdef WINS 
 DEFFILE		./v2_wins.def
 #else
-DEFFILE		.\v2_eabi.def
+DEFFILE		./v2_eabi.def
 #endif
 
 

--- a/messagingfw/biomsgfw/BITSTSRC/T_BIOLOG.MMP	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BITSTSRC/T_BIOLOG.MMP	Fri Apr 16 15:27:42 2010 +0300
@@ -14,14 +14,14 @@
 //
 
 TARGET        t_biolog.exe
-//TARGETPATH    \system\libs
+//TARGETPATH    /system/libs
 TARGETTYPE    exe
 
 CAPABILITY All -TCB
 
-SOURCEPATH	..\bitstsrc
+SOURCEPATH	../bitstsrc
 SOURCE        t_biolog.cpp  
-USERINCLUDE   ..\bitstsrc 
+USERINCLUDE   ../bitstsrc 
 APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY       bits.lib euser.lib efsrv.lib  // msgs.lib biut.lib

--- a/messagingfw/biomsgfw/BIUT/BLD.INF	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BIUT/BLD.INF	Fri Apr 16 15:27:42 2010 +0300
@@ -37,6 +37,6 @@
 group/BIUT.MMP
 
 PRJ_TESTMMPFILES
-//..\Biuttsrc\t_biomsg.mmp
+//../Biuttsrc/t_biomsg.mmp
 ../BIUTTSRC/t_ipaddr.mmp
 

--- a/messagingfw/biomsgfw/BIUT/group/BIUT.MMP	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BIUT/group/BIUT.MMP	Fri Apr 16 15:27:42 2010 +0300
@@ -20,7 +20,7 @@
 */
 
 TARGET        biut.dll
-//TARGETPATH    \system\libs
+//TARGETPATH    /system/libs
 TARGETTYPE    dll
 
 CAPABILITY All -TCB

--- a/messagingfw/biomsgfw/BIUTTSRC/T_BIOMSG.MMP	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BIUTTSRC/T_BIOMSG.MMP	Fri Apr 16 15:27:42 2010 +0300
@@ -14,14 +14,14 @@
 //
 
 TARGET        t_biomsg.exe
-//TARGETPATH    \system\libs
+//TARGETPATH    /system/libs
 TARGETTYPE    exe
 
 CAPABILITY All -TCB
 
-SOURCEPATH	..\biuttsrc
+SOURCEPATH	../biuttsrc
 SOURCE        t_biomsg.cpp  
-USERINCLUDE   ..\biuttsrc 
+USERINCLUDE   ../biuttsrc 
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 LIBRARY       euser.lib msgs.lib estor.lib efsrv.lib imcm.lib biut.lib etext.lib
 

--- a/messagingfw/biomsgfw/BIUTTSRC/t_ipaddr.mmp	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BIUTTSRC/t_ipaddr.mmp	Fri Apr 16 15:27:42 2010 +0300
@@ -14,7 +14,7 @@
 //
 
 TARGET        t_ipaddr.exe
-//TARGETPATH    \system\libs
+//TARGETPATH    /system/libs
 TARGETTYPE    exe
 
 CAPABILITY All -TCB

--- a/messagingfw/biomsgfw/BioWatchers/BLD.INF	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BioWatchers/BLD.INF	Fri Apr 16 15:27:42 2010 +0300
@@ -28,10 +28,10 @@
 class0sms.mmp
 
 PRJ_TESTMMPFILES
-//\BioMsg\BioWatchers\test\T_WapWatcher.mmp	manual
-//\BioMsg\BioWatchers\test\T_NbsWatcher.mmp	manual
+///BioMsg/BioWatchers/test/T_WapWatcher.mmp	manual
+///BioMsg/BioWatchers/test/T_NbsWatcher.mmp	manual
 
 PRJ_TESTEXPORTS
-// This is used by SMCM\test\t_smssendrecv Test Harness That both sends and recieves
+// This is used by SMCM/test/t_smssendrecv Test Harness That both sends and recieves
 Test/sendrecv.script	/epoc32/wins/c/test/sms/sendrecv.script
 Test/sendrecv.script	/epoc32/winscw/c/test/sms/sendrecv.script

--- a/messagingfw/biomsgfw/BioWatchers/Test/T_NbsWatcher.mmp	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BioWatchers/Test/T_NbsWatcher.mmp	Fri Apr 16 15:27:42 2010 +0300
@@ -18,8 +18,8 @@
 
 CAPABILITY All -TCB
 
-SOURCEPATH	..\test
-USERINCLUDE     ..\inc
+SOURCEPATH	../test
+USERINCLUDE     ../inc
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 SOURCE          T_NbsWatcher.cpp
 LIBRARY         euser.lib efsrv.lib etext.lib BAFL.lib estor.lib esock.lib NbsWatcher.lib gsmu.lib smsu.lib watcher.lib MsvTestUtils.lib

--- a/messagingfw/biomsgfw/BioWatchers/Test/T_WapWatcher.mmp	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/BioWatchers/Test/T_WapWatcher.mmp	Fri Apr 16 15:27:42 2010 +0300
@@ -18,8 +18,8 @@
 
 CAPABILITY All -TCB
 
-SOURCEPATH	..\test
-USERINCLUDE     ..\inc
+SOURCEPATH	../test
+USERINCLUDE     ../inc
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 SOURCE          T_WapWatcher.cpp
 LIBRARY         euser.lib efsrv.lib etext.lib BAFL.lib estor.lib esock.lib WapWatcher.lib gsmu.lib smsu.lib watcher.lib MsvTestUtils.lib bits.lib

--- a/messagingfw/biomsgfw/CBCPTSRC/T_CBCP.MMP	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/CBCPTSRC/T_CBCP.MMP	Fri Apr 16 15:27:42 2010 +0300
@@ -30,9 +30,9 @@
 #ifdef WINS 
 DEFFILE		../BIOS/bwins/bios.def
 #elif defined (GCC32)
-DEFFILE		..\bios\marm.def
+DEFFILE		../bios/marm.def
 #else
-DEFFILE		..\bios\eabi\bios.def
+DEFFILE		../bios/eabi/bios.def
 #endif
 
 VENDORID 0x70000001

--- a/messagingfw/biomsgfw/IACPTSRC/T_DB.MMP	Tue Feb 02 10:12:21 2010 +0200
+++ b/messagingfw/biomsgfw/IACPTSRC/T_DB.MMP	Fri Apr 16 15:27:42 2010 +0300
@@ -19,12 +19,12 @@
 TARGETTYPE  		exe
 
 CAPABILITY All -TCB
-SOURCEPATH	..\iacptsrc
+SOURCEPATH	../iacptsrc
 SOURCE 			t_db.cpp
 
-USERINCLUDE		..\iacptsrc
-USERINCLUDE		..\iacpinc
-USERINCLUDE		..\biutinc
+USERINCLUDE		../iacptsrc
+USERINCLUDE		../iacpinc
+USERINCLUDE		../biutinc
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 LIBRARY                 euser.lib msgs.lib 
 LIBRARY			biut.lib  bits.lib commdb.lib MsvTestUtils.lib

--- a/messagingfw/biomsgfw/cbcp/CBusinessCardParser class.htm	Tue Feb 02 10:12:21 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type"
-content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
-<title>CBusinessCardParser class</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<h2><a name="CBusinessCardParser"><font size="4"><tt>CBusinessCardParser</tt></font><font
-face="Times New Roman"> class &#151;</font></a><font
-face="Times New Roman"> Compact Business Card Parser</h2>
-
-<p></font><b><i>Section Contents</i></b></p>
-
-<ul>
-    <li><a href="#e32.eudsccls-004-001"><b>Overview</b></a> </li>
-    <li><a
-        href="#e32.desc-concrete.HBufC.allocation-and-construction"><b>Allocation
-        and construction</b></a> <ul>
-            <li><a href="#e32.desc-concrete.new"><font size="4"><b><tt>NewL()</tt></b></font><b>
-                &#151; Create new CBusinessCardParser</b></a> </li>
-        </ul>
-    </li>
-    <li><a href="#API"><strong>API &#151; Public functions</strong></a><ul>
-            <li><a href="#ParseL"><strong>ParseL &#151; Parse a
-                Compact Business Card message.</strong></a></li>
-            <li><a href="#ProcessL"><strong>ProcessL &#151; Parse
-                a Compact Business Card message.</strong></a></li>
-        </ul>
-    </li>
-</ul>
-
-<hr size="3">
-
-<h3><a name="e32.eudsccls-004-001">Overview</a></h3>
-
-<h5><a name="e32.eudsccls-004-002"><font size="3">Derivation</font></a></h5>
-
-<table border="1" cellpadding="2">
-    <tr>
-        <td valign="top"><a href="eutype.html#e32.class.CBase"><font
-        color="#000000" size="4"><tt>CBase</tt></font></a></td>
-        <td valign="top">Abstract: <a
-        href="eutype.html#e32.class.CBase"><font color="#000000"
-        size="4"><tt>CBase</tt></font></a> behaviour</td>
-    </tr>
-    <tr>
-        <td valign="top"><a href="#e32.class.CActive"><font
-        color="#000000" size="4"><tt>CActive</tt></font></a></td>
-        <td valign="top">Abstract: active object: provides
-        facilities to encapsulate an asynchronous service, and to
-        handle its completion using <font size="4"><tt>RunL()</tt></font></td>
-    </tr>
-    <tr>
-        <td valign="top"><a href="#CBusinessCardParser"><font
-        color="#000000" size="4"><tt>CBaseScriptParser</tt></font></a></td>
-        <td valign="top">Abstract: parser implementation.</td>
-    </tr>
-</table>
-
-<h5><a name="e32.eudsccls-004-003"><font size="3">Defined in</font></a></h5>
-
-<p><code>cbcp.h</code><font size="4"><tt>&nbsp;&nbsp;&nbsp;</tt></font></p>
-
-<h5><a name="e32.eudsccls-004-004"><font size="3">Link against</font></a></h5>
-
-<p><code>cbcp.lib</code></p>
-
-<h5><a name="e32.eudsccls-004-005"><font size="3">Description</font></a></h5>
-
-<p>This class provides functions to parse a Compact Business Card
-message. The parser creates an informative message body for the
-user and generates a vCard in the store associated with the
-message.</p>
-
-<hr size="3">
-
-<h3><a name="e32.desc-concrete.HBufC.allocation-and-construction">Allocation
-and construction</a></h3>
-
-<hr size="1">
-
-<h4><a name="e32.desc-concrete.new"><font size="4"><tt>NewL()</tt></font>
-&#151; Create new <font size="4"><tt>CBusinessCardParser</tt></font></a></h4>
-
-<p><tt>static CBusinessCardParser* NewL(CRegisteredParserDll&amp;
-aRegisteredParserDll, CMsvServerEntry&amp; aEntry, RFs&amp; aFs);</tt></p>
-
-<h5><a name="e32.eudsccls-004-006"><font size="3">Description</font></a></h5>
-
-<p>Use these functions to construct a new <a
-href="#CBusinessCardParser"><font color="#000000" size="4"><tt>CBusinessCardParser</tt></font></a>
-descriptor on the heap. Code should be provided to ensure that a
-single copy of the DLL is loaded and is released when no longer
-required.</p>
-
-<p>If there is insufficient memory available to create the
-descriptor,<font size="4"><tt> NewL()</tt></font> leaves. See <a
-href="euclnp.html#e32.exception.intro"><b>Motivating E32
-exception facilities</b></a> for more information on leave
-processing.</p>
-
-<h5><font size="3">Arguments</font></h5>
-
-<table border="1">
-    <tr>
-        <td valign="top"><a href="#CBusinessCardParser"><tt>CRegisteredParserDll&amp;</tt></a><tt>
-        aRegisteredParserDll</tt></td>
-        <td valign="top">A </td>
-    </tr>
-    <tr>
-        <td><a href="#CBusinessCardParser"><tt>CMsvServerEntry&amp;</tt></a><tt>
-        aEntry</tt></td>
-        <td>A message server entry containing the CBC message.</td>
-    </tr>
-    <tr>
-        <td><a href="#CBusinessCardParser"><tt>RFs&amp;</tt></a><tt>
-        aFs</tt></td>
-        <td>Handle of a file server session.</td>
-    </tr>
-</table>
-
-<h5><font size="3">Return value</font></h5>
-
-<table border="1">
-    <tr>
-        <td valign="top"><a href="#CBusinessCardParser"><font
-        color="#000000" size="4"><tt>CBusinessCardParser*</tt></font></a></td>
-        <td valign="top">The address of the newly created <a
-        href="#CBusinessCardParser"><font color="#000000"
-        size="4"><tt>CBusinessCardParser</tt></font></a>
-        descriptor.<p><font size="4"><tt>NewL()</tt></font>
-        leaves if there is insufficient memory.</p>
-        </td>
-    </tr>
-</table>
-
-<h5><a name="e32.eudsccls-004-009"><font size="3">Example</font></a></h5>
-
-<p>This code fragment illustrates how an <a
-href="#CBusinessCardParser"><font color="#000000" size="4"><tt>CBusinessCardParser</tt></font></a>
-descriptor can be constructed:</p>
-
-<p>Use of <font size="4"><tt>NewL()</tt></font>:</p>
-
-<blockquote>
-    <p>iRegisteredParserDll =
-    CRegisteredParserDll::NewL(uidType);<br>
-    RLibrary parserlibrary;<br>
-    User::LeaveIfError(iRegisteredParserDll-&gt;GetLibrary(gFs,parserlibrary));<br>
-    typedef CBaseScriptParser*
-    (*NewParserL)(CRegisteredParserDll&amp; aRegisteredParserDll,
-    CMsvServerEntry&amp; aEntry, RFs&amp; aFs);<br>
-    TInt entrypointordinalnumber=1; // The one and only entry
-    point.<br>
-    TLibraryFunction
-    libFunc=parserlibrary.Lookup(entrypointordinalnumber);<br>
-    if (libFunc==NULL)<br>
-    User::Leave(KErrBadLibraryEntryPoint);<br>
-    NewParserL pFunc=(NewParserL) libFunc;<br>
-    CBaseScriptParser* parser=NULL;<br>
-    TInt refcount=iRegisteredParserDll-&gt;DllRefCount();<br>
-    TRAPD(ret,parser=((*pFunc)(*iRegisteredParserDll, *iEntry,
-    gFs)));<br>
-    if ((ret!=KErrNone) &amp;&amp;
-    (iRegisteredParserDll-&gt;DllRefCount()==refcount))<br>
-    iRegisteredParserDll-&gt;ReleaseLibrary();</p>
-</blockquote>
-
-<hr size="3">
-
-<h3><a name="API">API &#151; Public functions</a></h3>
-
-<p><a name="ParseL"><strong>ParseL</strong></a><strong> &#151;
-Parse a </strong><a href="#CBusinessCardParser"><strong>Compact
-Business Card</strong></a><strong> message.</strong></p>
-
-<p>void ParseL(TRequestStatus&amp; aStatus, const TDesC&amp;
-aSms);</p>
-
-<h5><a name="e32.eudsccls-004-006"><font size="3">Description</font></a></h5>
-
-<p>Use this function to parse the Compact Business Card message
-aSms, stored in the TDesC. The parser creates an informative
-message body for the user and generates a vCard in the store
-associated with the message.</p>
-
-<h5><font size="3">Arguments</font></h5>
-
-<table border="1">
-    <tr>
-        <td valign="top">TRequestStatus&amp; aStatus</td>
-        <td valign="top">The request status of the active object.</td>
-    </tr>
-    <tr>
-        <td>const TDesC&amp; aSms</td>
-        <td>An SMS message.</td>
-    </tr>
-</table>
-
-<h5><font size="3">Return value</font></h5>
-
-<table border="1">
-    <tr>
-        <td valign="top"><font color="#000000" size="4"><tt>void</tt></font></td>
-    </tr>
-</table>
-
-<h5><a name="e32.eudsccls-004-009"><font size="3">Example</font></a></h5>
-
-<p>This code fragment illustrates how the parser is called:</p>
-
-<blockquote>
-    <p>iParser-&gt;ParseL(iStatus,iSms);</p>
-</blockquote>
-
-<hr size="1">
-
-<p><a name="ProcessL"><font face="Times New Roman"><strong>ProcessL</strong></font></a><font
-face="Times New Roman"><strong> &#151; Parse a </strong></font><a
-href="#CBusinessCardParser"><font face="Times New Roman"><strong>Compact
-Business Card</strong></font></a><font face="Times New Roman"><strong>
-message.</strong></font></p>
-
-<p>void ProcessL(TRequestStatus&amp; aStatus);</p>
-
-<h5><a name="e32.eudsccls-004-006"><font size="3">Description</font></a></h5>
-
-<p>This function is not implemented in the current version of the
-parser. It may be used to implement further actions with the
-parsed message.</p>
-
-<h5><font size="3">Arguments</font></h5>
-
-<table border="1">
-    <tr>
-        <td valign="top">TRequestStatus&amp; aStatus</td>
-        <td valign="top">The request status of the active object.</td>
-    </tr>
-</table>
-
-<h5><font size="3">Return value</font></h5>
-
-<table border="1">
-    <tr>
-        <td valign="top"><font color="#000000" size="4"><tt>void</tt></font></td>
-    </tr>
-</table>
-
-<h5><a name="e32.eudsccls-004-009"><font size="3">Example</font></a></h5>
-
-<p>This code fragment illustrates how the message process stage
-of the parser is called:</p>
-
-<blockquote>
-    <p>iParser-&gt;ProcessL(iStatus)</p>
-</blockquote>
-
-<p>This interface currently returns after issuing a
-User::RequestComplete(iReport, KErrNotSupported).</p>
-
-<hr size="3">
-
-<p>&nbsp;</p>
-</body>
-</html>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/deprecate/group/bld.inf	Fri Apr 16 15:27:42 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   Includes all the SDK API specific bld.inf files, which 
+*                export files.
+*
+*/
+
+
+
+#include "../send_ui_api/group/bld.inf"
+#include "../send_ui_datautils_api/group/bld.inf"
+#include "../send_ui_plugin_api/group/bld.inf"
+#include "../senduiservices/group/bld.inf"
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/deprecate/send_ui_api/group/bld.inf	Fri Apr 16 15:27:42 2010 +0300
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) 2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   File that exports the files belonging to 
+:                Send UI API
+*
+*/
+
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+../inc/CMessageData.h     MW_LAYER_PUBLIC_EXPORT_PATH(CMessageData.h)
+../inc/TSendingCapabilities.inl     MW_LAYER_PUBLIC_EXPORT_PATH(TSendingCapabilities.inl)
+../inc/SendUiConsts.h     MW_LAYER_PUBLIC_EXPORT_PATH(SendUiConsts.h)
+../inc/SendUi.h     MW_LAYER_PUBLIC_EXPORT_PATH(sendui.h)
+../inc/TSendingCapabilities.h     MW_LAYER_PUBLIC_EXPORT_PATH(TSendingCapabilities.h)
+../inc/CSendingServiceInfo.h     MW_LAYER_PUBLIC_EXPORT_PATH(CSendingServiceInfo.h)
+../inc/CMessageAddress.h     MW_LAYER_PUBLIC_EXPORT_PATH(CMessageAddress.h)
+../inc/SenduiMtmUids.h     MW_LAYER_PUBLIC_EXPORT_PATH(SenduiMtmUids.h)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/deprecate/send_ui_api/inc/CMessageAddress.h	Fri Apr 16 15:27:42 2010 +0300
@@ -0,0 +1,135 @@
+/*
+* Copyright (c) 2002-2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   Encapsulates message real addressa and alias
+*
+*/
+
+
+
+#ifndef C_MESSAGEADDRESS_H
+#define C_MESSAGEADDRESS_H
+
+#include <e32base.h>
+
+class CMessageAddressImpl;
+class RWriteStream;
+class RReadStream;
+
+/**
+ *  Encapsulates message recipient real address and alias.
+ *
+ *  @lib sendui
+ *  @since S60 v3.0
+ */
+class CMessageAddress : public CBase
+{
+public:  // Constructors and destructor
+
+    /**
+    * Two-phased constructor.
+    */
+    IMPORT_C static CMessageAddress* NewL();
+    
+    /**
+    * Two-phased constructor. Leaves object to cleanup stack.
+    */
+    IMPORT_C static CMessageAddress* NewLC();
+    
+    /**
+    * Destructor.
+    */
+    IMPORT_C virtual ~CMessageAddress();
+
+public: // New functions
+
+   /**
+    * Sets real address.
+    *
+    * @since Series 60 3.0
+    * @param aAddress Real address.
+    * @return None.
+    */
+    IMPORT_C void SetAddressL( const TDesC& aAddress );
+
+   /**
+    * Returns real address.
+    *
+    * @since Series 60 3.0
+    * @return Real address.
+    */
+    IMPORT_C const TPtrC Address() const;
+
+    /**
+    * Sets alias for the real address.
+    *
+    * @since Series 60 3.0
+    * @param aAlias Alias for the real address.
+    * @return None.
+    */
+    IMPORT_C void SetAliasL( const TDesC& aAlias );
+
+   /**
+    * Returns alias for the address.
+    *
+    * @since Series 60 3.0
+    * @return Alias for the real address.
+    */
+    IMPORT_C const TPtrC Alias() const;
+
+    /**
+    * Externalizes address data to a stream
+    *
+    * @since Series 60 3.2
+    * @param aStream Destination stream
+    * @return None.
+    */ 
+    IMPORT_C void ExternalizeL( RWriteStream& aStream );
+    
+    /**
+    * Internalizes message data from a stream
+    *
+    * @since Series 60 3.2
+    * @param Source stream
+    * @return None.
+    */ 
+    IMPORT_C void InternalizeL( RReadStream& aStream );
+
+private:
+    
+    /**
+    * C++ default constructor.
+    */
+    CMessageAddress();
+    
+    /**
+    * Symbian 2nd phase constructor.
+    */
+    void ConstructL();
+
+private:  // Data
+
+    /**
+     * Message address implementation.
+     * Own.
+     */
+    CMessageAddressImpl* iMessageAddressImpl;
+    };
+
+/**  Address array */
+   
+typedef CArrayPtrFlat<CMessageAddress> CMessageAddressArray;
+
+#endif      // C_MESSAGEADDRESS_H
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/deprecate/send_ui_api/inc/CMessageData.h	Fri Apr 16 15:27:42 2010 +0300
@@ -0,0 +1,312 @@
+/*
+* Copyright (c) 2002-2006 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   Encapsulates the message data for sending services.
+*
+*/
+
+
+#ifndef C_MESSAGEDATA_H
+#define C_MESSAGEDATA_H
+
+#include <e32base.h>
+#include <badesca.h>
+#include <f32file.h>
+#include <msvstd.h>
+#include "CMessageAddress.h"
+
+class MDesC16Array;
+class CRichText;
+class CMessageDataImpl;
+
+/**
+ *  Encapsulates the message data for sending services.
+ *
+ *  Encapsulates the message data for sending services. Class supports
+ *  externalazation and internalization, which are used to relay message 
+ *  to SendUI server application.
+ *
+ *  @lib sendui
+ *  @since S60 v3.0
+ */ 
+class CMessageData : public CBase
+{
+public:  // Constructors and destructor
+
+   /**
+    * Two-phased constructor.
+    *
+    * @return Pointer to object of CMessageData.
+    */
+    IMPORT_C static CMessageData* NewL();
+    
+   /**
+    * Two-phased constructor.
+    *
+    * @return Pointer to object of CMessageData.
+    */
+    IMPORT_C static CMessageData* NewLC();
+
+   /**
+    * Destructor.
+    */
+    IMPORT_C virtual ~CMessageData();
+
+public: // New functions
+
+   /**
+    * Set message subject.
+    *
+    * @since Series 60 3.0
+    * @param aSubject Sets message subject. Does not take ownership.
+    * @return None.
+    */
+    IMPORT_C void SetSubjectL( const TDesC* aSubject );
+
+   /**
+    * Returns message subject.
+    *
+    * @since Series 60 3.0
+    * @return Message subject.
+    */
+    IMPORT_C const TPtrC Subject() const;
+
+   /**
+    * Appends attachment file path to the array of attachment file paths. Only a link 
+    * to the attachment is stored and compared to AppendAttachmentHandleL less resources 
+    * is used during the send operation.
+    * 
+    * NOTE: Do not add any temporary files as an attachment. Always use 
+    * AppendAttachmentHandleL for temporary files.
+    *
+    * @since Series 60 3.0
+    * @param aFilePath File path of the attachment. 
+    *                  
+    * @return None.
+    */
+    IMPORT_C void AppendAttachmentL( const TDesC& aFilePath );
+
+   /**
+    * Returns the array of attachment file paths.
+    *
+    * @since Series 60 3.0
+    * @return Array of attachment file paths.
+    */
+    IMPORT_C const CDesCArray& AttachmentArray() const;
+    
+    /**
+    * Clears the array of attachment file paths.
+    *
+    * @since Series 60 3.0
+    * @return Array of attachment file paths.
+    */        
+    IMPORT_C void ClearAttachmentArray();
+
+   /**
+    * Encapsulates address and alias to CMessageAddress and adds to array.
+    *
+    * @since Series 60 3.0
+    * @param aAddress Real address.
+    * @param aAlias Alias for the real address.
+    * @return None.
+    */
+    IMPORT_C void AppendToAddressL(
+        const TDesC& aAddress,
+        const TDesC& aAlias = KNullDesC);
+
+   /**
+    * Returns array of addresses and aliases.
+    *
+    * @since Series 60 3.0
+    * @return Array of addresses and aliases.
+    */
+    IMPORT_C const CMessageAddressArray& ToAddressArray() const;
+
+   /**
+    * Encapsulates CC address and alias to CMessageAddress and adds to 
+    * array.
+    *
+    * @since Series 60 3.0
+    * @param aCcAddress Real CC-address.
+    * @param aCcAlias Alias for the real CC-address.
+    * @return None.
+    */
+    IMPORT_C void AppendCcAddressL(
+        const TDesC& aCcAddress,
+        const TDesC& aCcAlias = KNullDesC);
+
+   /**
+    * Returns array of CC addresses and aliases.
+    *
+    * @since Series 60 3.0
+    * @return Array of cc addresses and aliases.
+    */
+    IMPORT_C const CMessageAddressArray& CcAddressArray() const;
+
+   /**
+    * Encapsulates Bcc address and alias to CMessageAddress and adds to
+    * array.
+    *
+    * @since Series 60 3.0
+    * @param aBccAddress Real Bcc-address.
+    * @param aBccAlias Alias for the real Bcc-address.
+    * @return None.
+    */
+    IMPORT_C void AppendBccAddressL(
+        const TDesC& aBccAddress,
+        const TDesC& aBccAlias = KNullDesC);
+
+   /**
+    * Returns array of Bcc addresses and aliases.
+    *
+    * @since Series 60 3.0
+    * @return Array of Bcc addresses and aliases.
+    */
+    IMPORT_C const CMessageAddressArray& BccAddressArray() const;
+
+   /**
+    * Set message body text.
+    *
+    * @since Series 60 3.0
+    * @param aBodyText Message body text.
+    * @return None.
+    */
+    IMPORT_C void SetBodyTextL( const CRichText* aBodyText );
+
+   /**
+    * Returns message body text.
+    *
+    * @since Series 60 3.0
+    * @return Message body text.
+    */
+    IMPORT_C const CRichText* BodyText() const;
+    
+   /**
+    * Appends attachment handle to the array of attachment handles. 
+    *
+    * NOTE: Attachment handles should be opened using ShareProtected()
+    * file session, otherwise handles can not be transfered through
+    * client-server interface.
+    *
+    * NOTE: When adding a temporary file as an attachment, always use this method,
+    *
+    * @since Series 60 3.0
+    * @param aFileHandle File handle of the attachment.
+    * @return None.
+    */
+    IMPORT_C void AppendAttachmentHandleL( const RFile& aFileHandle );
+
+    /**
+    * Returns the array of attachment handles.
+    *
+    * @since Series 60 3.0
+    * @return Array of attachment handles.
+    */
+    IMPORT_C const RArray<RFile>& AttachmentHandleArray() const;
+
+   /**
+    * Returns data type id.
+    *
+    * This can be used for interpreting the opaque data.
+    * @since Series 60 3.0
+    * @return Data type id.
+    */
+    IMPORT_C TUid DataType() const;
+
+   /**
+    * Clears all addressee arrays.
+    *
+    * @since Series 60 3.0
+    * @return None.
+    */ 
+    IMPORT_C void ClearAddresses();
+
+   /**
+    * Externalizes message data to a stream
+    *
+    * @since Series 60 3.2
+    * @return None.
+    */ 
+   
+   IMPORT_C void ExternalizeL( RWriteStream& aStream ) const;
+    
+   /**
+    * Internalizes message data to from a stream
+    *
+    * @since Series 60 3.2
+    * @return None.
+    */ 
+    IMPORT_C void InternalizeL( RReadStream& aStream );
+
+   /**
+    * Set opaque data
+    *
+    * @since Series 60 3.2
+    * @param aData Opaque data.
+    * @param aDataType, Identifier for the opaque data.
+    * @return None.
+    */
+    IMPORT_C void SetOpaqueDataL( const TDesC8* aData, TUid aDataType );
+    
+   /**
+    * Get opaque data
+    *
+    * @since Series 60 3.2
+    * @return aData Opaque data.
+    */
+    IMPORT_C const TPtrC8 OpaqueData() const;
+
+ protected:
+
+   /**
+    * C++ default constructor.
+    */
+    IMPORT_C CMessageData();
+
+   /**
+    * By default Symbian 2nd phase constructor is private.
+    */
+    IMPORT_C void ConstructL();
+
+protected:  // Data
+
+    /**
+     * Data type of this message. Normally this is KSenduiMsgDataBase
+     * This can be used for interpreting the opaque data.
+     */
+    TUid iDataType;
+
+private:  // Data
+
+    /**
+     *  Message data implementation.
+     *  Owned.
+     */
+    CMessageDataImpl* iMessageDataImpl;
+
+    /**
+     *  Reserved.
+     */
+    TAny* iReserved1;
+    TAny* iReserved2;
+    TAny* iReserved3;
+    TAny* iReserved4;
+    TAny* iReserved5;
+    RArray<TAny*> iReserved6;
+
+};
+
+#endif      // C_MESSAGEDATA_H
+
+// End of File
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/deprecate/send_ui_api/inc/CSendingServiceInfo.h	Fri Apr 16 15:27:42 2010 +0300
@@ -0,0 +1,225 @@
+/*
+* Copyright (c) 2002-2004 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   Encapsulates the ECom plugged sending service data.
+*
+*/
+
+
+
+#ifndef CSENDINGSERVICEINFO_H
+#define CSENDINGSERVICEINFO_H
+
+// INCLUDES
+#include <e32base.h>
+//#include <SendUi.h>     // TSendingCapabilities
+
+// FORWARD DECLARATIONS
+class TSendingCapabilities;
+class CSendingServiceInfoImpl;
+
+// CLASS DECLARATION
+
+/**
+ * Encapsulates the ECom plugged sending service data.
+ *
+ * @lib Sendui
+ * @since Series 60 3.0
+ */ 
+class CSendingServiceInfo : public CBase
+    {
+    public:
+    
+    enum TServiceFeatures
+        {
+        EServiceInValid = 1,
+        EServiceHidden = 2,
+        EServiceCanSendDirectly = 4,
+        ENotUsed3 = 8
+        };
+        
+    public:  // Constructors and destructor
+    
+        /**
+        * Two-phased constructor.
+        * @return Pointer to object of CSendingServiceInfo.
+        */
+        IMPORT_C static CSendingServiceInfo* NewL();
+        
+        /**
+        * Two-phased constructor.
+        * @return Pointer to object of CSendingServiceInfo.
+        */
+        IMPORT_C static CSendingServiceInfo* NewLC();
+
+        /**
+        * Destructor.
+        */
+        IMPORT_C virtual ~CSendingServiceInfo();
+
+    public: // New functions
+
+        /**
+        * Creates a copy of CSendingServiceInfo object.
+        * @since Series 60 3.0
+        * @return A pointer to the new copy of the CSendingServiceInfo object.
+        */
+        IMPORT_C CSendingServiceInfo* CopyLC() const;
+
+        /**
+        * Set service human readable name.
+        * Service name is used in editors "To"-field.
+        * @since Series 60 3.0
+        * @param aServiceName Service human readable name.
+        * @return None.
+        */
+        IMPORT_C void SetServiceNameL( const TDesC& aServiceName );
+
+        /**
+        * Returns service human readable name.
+        * Service name is used in editors "To"-field.
+        * @since Series 60 3.0
+        * @return Service human readable name.
+        */
+        IMPORT_C const TPtrC ServiceName() const;
+
+        /**
+        * Set service human readable name for the "Send"-menu.
+        * @since Series 60 3.0
+        * @param aServiceMenuName Service human readable name for the
+        *        "Send"-menu.
+        * @return None.
+        */
+        IMPORT_C void SetServiceMenuNameL( const TDesC& aServiceMenuName );
+
+        /**
+        * Returns service human readable name for the "Send"-menu.
+        * @since Series 60 3.0
+        * @return Service human readable name for the "Send"-menu.
+        */
+        IMPORT_C const TPtrC ServiceMenuName() const;
+
+        /**
+        * Set service address.
+        * @since Series 60 3.0
+        * @param aServiceAddress Service address.
+        * @return None.
+        */
+        IMPORT_C void SetServiceAddressL( const TDesC& aServiceAddress );
+
+        /**
+        * Returns service address. 
+        * @since Series 60 3.0
+        * @return Service address.
+        */
+        IMPORT_C const TPtrC ServiceAddress() const;
+
+        /**
+        * Set sending service id.
+        * @since Series 60 3.0
+        * @param aServiceId Service id.
+        * @return None.
+        */
+        IMPORT_C void SetServiceId( TUid aServiceId );
+
+        /**
+        * Returns sending service id.
+        * @since Series 60 3.0
+        * @return Service id.
+        */
+        IMPORT_C TUid ServiceId() const;
+
+        /**
+        * Set sending service provider id.
+        * @since Series 60 3.0
+        * @param aServiceProviderId Service provider id.
+        * @return None.
+        */
+        IMPORT_C void SetServiceProviderId( TUid aServiceProviderId );
+
+        /**
+        * Returns sending service provider id.
+        * @since Series 60 3.0
+        * @return Service provider id.
+        */
+        IMPORT_C TUid ServiceProviderId() const;
+
+        
+          /**
+        * Returns sending service technology type id.
+        * @since Series 60 3.2
+        * @return Service id.
+        */
+        IMPORT_C void SetTechnologyTypeId( TUid aTechnologyType );
+        /**
+        * Returns sending service technology type id.
+        * @since Series 60 3.2
+        * @return Service id.
+        */
+        IMPORT_C TUid TechnologyTypeId() const;
+
+
+        /**
+        * Set service sending capabilities.
+        * @since Series 60 3.0
+        * @param aServiceCapabilities Service sending capabilities.
+        * @return None.
+        */
+        IMPORT_C void SetServiceCapabilities(
+            TSendingCapabilities aServiceCapabilities );
+
+        /**
+        * Returns service sending capabilities.
+        * @since Series 60 3.0
+        * @return Service sending capabilities.
+        */
+        IMPORT_C TSendingCapabilities ServiceCapabilities() const;
+
+       /**
+        * Set sending service features
+        * @since Series 60 3.2
+        * @param aServiceCapabilities Sending service features.
+        * @return None.
+        */
+        IMPORT_C void SetServiceFeatures(
+            TInt aServiceFeatures );
+
+        /**
+        * Returns service features.
+        * @since Series 60 3.2
+        * @return Sending service features.
+        */
+        IMPORT_C TInt ServiceFeatures() const;
+        
+
+    private:
+
+
+        /**
+        * C++ default constructor.
+        */
+        CSendingServiceInfo();
+
+        /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+        void ConstructL();
+
+    private:  // Data
+
+        CSendingServiceInfoImpl*            iServiceInfoImpl;
+    };
+
+#endif      // CSENDINGSERVICEINFO_H
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/deprecate/send_ui_api/inc/SendUi.h	Fri Apr 16 15:27:42 2010 +0300
@@ -0,0 +1,385 @@
+/*
+* Copyright (c) 2002-2004 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   Can be used to show "Send" list query and to create and send
+*                messages via available sending services. Created messages are
+*                sent directly or message editor is opened for editing,
+*                depending on the type of the selected service.
+*
+*/
+
+
+
+
+#ifndef CSENDUI_H
+#define CSENDUI_H
+
+#include <TSendingCapabilities.h>
+
+// FORWARD DECLARATIONS
+class CEikMenuPane;
+class CSendUiImpl;
+class CMessageData;
+class CSendingServiceInfo;
+
+#define KMaxStringLength 1024;
+
+// CLASS DECLARATION
+
+
+/**
+*  Offers "Send" pop-up list and message creation and sending services.
+*  
+*  Can be used to display "Send" list query and to create and send
+*  messages via available services. Sending services can be based
+*  on the MTM or ECom architecture. Created messages are sent
+*  directly or message editor is opened for editing, depending on
+*  the type of selected service.
+*
+*  @lib SendUi.lib
+*  @since Series 60 3.0
+*/
+class CSendUi : public CBase
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        */
+        IMPORT_C static CSendUi* NewL();
+
+        /**
+        * Two-phased constructor.
+        */
+        IMPORT_C static CSendUi* NewLC();
+
+        /**
+        * Destructor.
+        */
+        IMPORT_C virtual ~CSendUi();
+
+    public: // New functions
+
+        /**
+        * Adds "Send" menu item to menupane.
+        *
+        * @since Series 60 3.0
+        * @param aMenuPane Menupane where the "Send" menu item should be added.
+        * @param aIndex The place of the "Send" menu item in menupane.
+        * @param aCommandId Command id for the "Send" menu item.
+        * @param aRequiredCapabilities Capabilities required by services to be
+        *        shown in "Send" list query. If no capabilities are required
+        *        (KCapabilitiesForAllServices), all available services are
+        *        shown in "Send" list query.
+        * @return None.
+        */
+        IMPORT_C void AddSendMenuItemL(
+            CEikMenuPane& aMenuPane,
+            TInt aIndex,
+            TInt aCommandId,
+            TSendingCapabilities aRequiredCapabilities = KCapabilitiesForAllServices );
+
+        /**
+        * First displays "Send" pop-up list query and then creates the message.
+        * Editor is launched for editing the message or the message is sent
+        * directly without opening the editor. Functionality depends on the
+        * type of selected service.
+        *
+        * "Send" pop-up list query can be manipulated in three ways. All three
+        *  methods can be used or just some of those.
+        *
+        * The first option is to set the required capabilities for services.
+        * Eg. attachments supported. Sending services not matching to required
+        * capabilities are filtered away. Capabilities are defined in
+        * TSendingCapabilities.h.
+        *
+        * The second option is content based filtering. Filtering is based on
+        * the files intended to send. Those files can be set as part of message
+        * data. Filtering is done according the predefined rules.
+        * Eg. If oversized file is intended to send, MMS is filtered away from
+        * "Send" pop-up list.
+        *
+        * The third option is to set the array of service uids not wanted to
+        * be shown in list query. These sending services are filtered away
+        * even if those match to required capabilities.
+        *
+        * @since Series 60 3.0
+        * @param aMessageData Data for the message.
+        * @param aRequiredCapabilities Capabilities required by sending services
+        *        to be shown in "Send" pop-up list query. If no capabilities are
+        *        required (KCapabilitiesForAllServices), all available services
+        *        are shown in "Send" pop-up list query.
+        * @param aServicesToDim Array of service uids (service uid, service 
+        *        provider's uid or service's TechnologyType) _NOT_ wanted to "Send" 
+        *        list query. 
+        *        See predefined sending service uids in SendUiConsts.h .
+        * @param aBioTypeUid BIO message type uid. Deprecated.
+        * @param aLaunchEditorEmbedded ETrue if the editor should be launched
+        *        embedded. Otherwise the editor is launched stand-alone.
+        *        Note: some services sends the messages without launching the
+        *        editor at all.
+        * @param aTitleText Title of the "Send" pop-up list query. If no title
+        *        is defined, then the localised default title "Send:" is used.
+        * @return None.
+        */
+        IMPORT_C void ShowQueryAndSendL(
+            const CMessageData* aMessageData,
+            TSendingCapabilities aRequiredCapabilities = KCapabilitiesForAllServices,
+            CArrayFix<TUid>* aServicesToDim = NULL,
+            TUid aBioTypeUid = KNullUid,
+            TBool aLaunchEditorEmbedded = ETrue,
+            const TDesC& aTitleText = KNullDesC );
+
+        /**
+        * Displays "Send" pop-up list query and returns the user selection.
+        *
+        * "Send" pop-up list query can be manipulated in three ways. All three
+        *  methods can be used or just some of those.
+        *
+        * The first option is to set the required capabilities for services.
+        * Eg. attachments supported. Sending services not matching to required
+        * capabilities are filtered away. Capabilities are defined in
+        * TSendingCapabilities.h.
+        *
+        * The second option is content based filtering. Filtering is based on
+        * the files intended to send. Those files can be set as part of message
+        * data. Filtering is done according the predefined rules.
+        * Eg. If oversized file is intended to send, MMS is filtered away from
+        * "Send" pop-up list.
+        *
+        * The third option is to set the array of service uids not wanted to
+        * be shown in list query. These sending services are filtered away
+        * even if those match to required capabilities.
+        * 
+        * @since Series 60 3.0
+        * @param aMessageData Data for the message. Attachments are used for
+        *        content based filtering.
+        * @param aRequiredCapabilities Capabilities required by sending services
+        *        to be shown in "Send" pop-up list query. If no capabilities are
+        *        required (KCapabilitiesForAllServices), all available services
+        *        are shown in "Send" pop-up list query.
+        * @param aServicesToDim Array of service uids (service uid, service 
+        *        provider's uid or service's TechnologyType) _NOT_ wanted to "Send" 
+        *        list query. 
+        *        See predefined sending service uids in SendUiConsts.h .
+        * @param aTitleText Title of the "Send" pop-up list query. If no title
+        *        is defined, then the localised default title "Send:" is used.        
+        * @return Uid of the selected service (MTM or ECom). 
+        *        KNullId is returned if user selects cancel.
+        */
+        IMPORT_C TUid ShowSendQueryL(
+            const CMessageData* aMessageData = NULL,
+            TSendingCapabilities aRequiredCapabilities = KCapabilitiesForAllServices,
+            CArrayFix<TUid>* aServicesToDim = NULL,
+            const TDesC& aTitleText = KNullDesC );
+
+        /**
+        * Creates the message and launches the editor for editing the message
+        * or sends the message directly without opening the editor. 
+        * Functionality depends on the type of selected service.
+        *
+        * @since Series 60 3.0
+        * @param aServiceUid Uid of the sending service (MTM or ECom).
+        * @param aMessageData Data for the message.
+        * @param aBioTypeUid BIO message type uid. Deprecated.
+        * @param aLaunchEditorEmbedded ETrue if the editor should be launched
+        *        embedded. Otherwise the editor is launched stand-alone.
+        *        Note: some sending services sends the messages without
+        *        launching the editor at all.
+        * @return None.
+        */
+        IMPORT_C void CreateAndSendMessageL(
+            TUid aServiceUid,
+            const CMessageData* aMessageData,
+            TUid aBioTypeUid = KNullUid,
+            TBool aLaunchEditorEmbedded = ETrue );
+
+        /**
+        * Validates that service is available and has required capabilities.
+        * For ex. can be used when calling application creates its own "Send"
+        * menu.
+        * @since Series 60 3.0
+        * @param aServiceUid Uid of the sending service (MTM or ECom).
+        * @param aRequiredCapabilities Capabilities required for the sending
+        *        service. 
+        * @return ETrue if service is available and it has required 
+        *         capabilities,otherwise EFalse.
+        */
+        IMPORT_C TBool ValidateServiceL(
+            TUid aServiceUid,
+            TSendingCapabilities aRequiredCapabilities );
+
+        /**
+        * Returns sending capabilities of the sending service.
+        * @since Series 60 3.0
+        * @param aServiceUid Uid of the sending service (MTM or ECom).
+        * @param aServiceCapabilities TSendingCapabilities of the sending
+        *        service as a return value.        
+        * @return Return KErrNone if successful, or one of the system wide
+        *         errors if unsuccessful.
+        */
+        IMPORT_C TInt ServiceCapabilitiesL(
+            TUid aServiceUid,
+            TSendingCapabilities& aServiceCapabilities );       
+       
+        /**
+        * Can be used to check if sending of bio message is supported. Deprecated.
+        * @since Series 60 3.0
+        * @param aBioMessageUid Uid of the bio message.
+        * @return: Returns always EFalse
+        */
+        IMPORT_C TBool CanSendBioMessage( TUid aBioMessageUid ) const;
+
+        /**
+        * Populates given list with the information about services
+        * provided by specified ECom service provider.
+        * Each service provider can provide 1..n services.
+        * Ownership of the pointed objects are transfered to caller.
+        *
+        * Can be used for ex. when creating own "Send" menu, which needs to
+        * include ECom based services.
+        *
+        * NOTE: Can be used only for ECom based services, also for MTMs
+        *
+        * @since Series 60 2.8
+        * @param aServiceList Service list to be populated.
+        * @param aServiceProvider Id of the specified service provider.
+        *        KNullId means all service providers.
+        *        Service providers are defined in SendUiConsts.h
+        * @return none
+        */
+        IMPORT_C void AvailableServicesL(
+            RPointerArray<CSendingServiceInfo>& aServiceList,
+            TUid aServiceProvider = KNullUid);
+
+        // Menu type enumeration
+        enum TSendUiMenuType
+            {
+            ESendMenu,
+            EWriteMenu
+            };
+
+        /**
+        * Adds menu item of given type to menupane.
+        *
+        * @since Series 60 3.0
+        * @param aMenuType Type of the menu, "ESendMenu" or "EWriteMenu"
+        * @param aMenuPane Menupane where the menu item should be added.
+        * @param aIndex The place of the menu item in menupane.
+        * @param aCommandId Command id for the menu item.
+        * @param aRequiredCapabilities Capabilities required from services to be
+        *        shown in list query. If no capabilities are required
+        *        (KCapabilitiesForAllServices), all available services are
+        *        shown in list query.
+        * @return None.
+        */
+        IMPORT_C void AddTypedMenuItemL(
+            TSendUiMenuType aMenuType, 
+            CEikMenuPane& aMenuPane,
+            TInt aIndex,
+            TInt aCommandId,
+            TSendingCapabilities aRequiredCapabilities = KCapabilitiesForAllServices );
+
+        /**
+        * Displays list query and creates message.
+        * See ShowQueryAndSendL.
+        *
+        * @since Series 60 3.0
+        * @param aMenuType Type of the menu, e.g. "ESendMenu" or "EWriteMenu"
+        * @param aMessageData Data for the message.
+        * @param aRequiredCapabilities Capabilities required by sending services
+        *        to be shown in "Send" pop-up list query. If no capabilities are
+        *        required (KCapabilitiesForAllServices), all available services
+        *        are shown in "Send" pop-up list query.
+        * @param aServicesToDim Array of service uids (service uid, service 
+        *        provider's uid or service's TechnologyType) _NOT_ wanted to "Send" 
+        *        list query. 
+        *        See predefined sending service uids in SendUiConsts.h .
+        * @param aBioTypeUid BIO message type uid. Deprecated.
+        * @param aLaunchEditorEmbedded ETrue if the editor should be launched
+        *        embedded. Otherwise the editor is launched stand-alone.
+        *        Note: some services sends the messages without launching the
+        *        editor at all.
+        * @param aTitleText Title of the list query. If no title is defined,
+        *        then the localised default title is used, e.g. "Send" or 
+        *        "Write".
+        * @return None.
+        */
+        IMPORT_C void ShowTypedQueryAndSendL(
+            TSendUiMenuType aMenuType, 
+            const CMessageData* aMessageData,
+            TSendingCapabilities aRequiredCapabilities = KCapabilitiesForAllServices,
+            CArrayFix<TUid>* aServicesToDim = NULL,
+            TUid aBioTypeUid = KNullUid,
+            TBool aLaunchEditorEmbedded = ETrue,
+            const TDesC& aTitleText = KNullDesC );
+
+        /**
+        * Displays list query and returns the user selection.
+        * See ShowSendQueryL.
+        * 
+        * @since Series 60 3.0
+        * @param aMenuType Type of the menu, e.g. "ESendMenu" or "EWriteMenu"
+        * @param aMessageData Data for the message. Attachments are used for
+        *        content based filtering.
+        * @param aRequiredCapabilities Capabilities required by sending services
+        *        to be shown in list query. If no capabilities are required
+        *        (KCapabilitiesForAllServices), all available services are 
+        *        shown in list query.
+        * @param aServicesToDim Array of service uids (service uid, service 
+        *        provider's uid or service's TechnologyType) _NOT_ wanted to "Send" 
+        *        list query. 
+        *        See predefined sending service uids in SendUiConsts.h .
+        * @param aTitleText Title of the list query. If no title is defined,
+        *        then the localised default title is used, e.g. "Send" or 
+        *        "Write"
+        * @return Uid of the selected service (MTM or ECom). 
+        *        KNullId is returned if user selects cancel.
+        */
+        IMPORT_C TUid ShowTypedQueryL(
+            TSendUiMenuType aMenuType, 
+            const CMessageData* aMessageData = NULL,
+            TSendingCapabilities aRequiredCapabilities = KCapabilitiesForAllServices,
+            CArrayFix<TUid>* aServicesToDim = NULL,
+            const TDesC& aTitleText = KNullDesC );
+
+        /**
+        *   Returns the technology type of a service
+        *
+        *   @since Series 60 3.0
+        *   @param aServiceId Service of interest
+        *   @return Technology type of the provided service. NULL if Mtm
+        *           service doesn't exist or service is ECOM based.
+        */
+        IMPORT_C TUid TechnologyType( TUid aServiceUid ) const;
+
+    private:
+
+        /**
+        * C++ default constructor.
+        */
+        CSendUi();
+
+        /**
+        * By default Symbian 2nd phase constructor is private.
+        */
+        void ConstructL();
+
+    private:    // Data
+        // SendUi API implmentation. Owned.
+        CSendUiImpl*                        iSendUiImpl;
+    };
+
+#endif      // CSENDUI_H
+
+// End of File