# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284486910 -10800
# Node ID 3e6957da2ff8e09fedf91680429ba601cb2a8016
# Parent  4f0867e42d62343834b607d8a338aede3e501cc1
Revision: 201033
Kit: 201035

diff -r 4f0867e42d62 -r 3e6957da2ff8 omads/omadsappui/AiwSyncProvider/src/AiwSyncProvider.cpp
--- a/omads/omadsappui/AiwSyncProvider/src/AiwSyncProvider.cpp	Wed Sep 01 12:30:02 2010 +0100
+++ b/omads/omadsappui/AiwSyncProvider/src/AiwSyncProvider.cpp	Tue Sep 14 20:55:10 2010 +0300
@@ -25,7 +25,7 @@
 
 #include <data_caging_path_literals.hrh>  // for resource and bitmap directories
 
-#include <AiwSyncProvider.rsg>
+#include <aiwsyncprovider.rsg>
 #include "AiwSyncProvider.h"
 #include "AiwSyncProviderUids.hrh"
 #include "AiwSyncProvider.rh"
diff -r 4f0867e42d62 -r 3e6957da2ff8 omads/omadsappui/AspPreSyncPlugin/src/AspPreSyncDefaultPlugin.cpp
--- a/omads/omadsappui/AspPreSyncPlugin/src/AspPreSyncDefaultPlugin.cpp	Wed Sep 01 12:30:02 2010 +0100
+++ b/omads/omadsappui/AspPreSyncPlugin/src/AspPreSyncDefaultPlugin.cpp	Tue Sep 14 20:55:10 2010 +0300
@@ -31,9 +31,9 @@
 
 
 #include <AknQueryDialog.h>
-#include <AspSyncUtil.rsg>
+#include <aspsyncutil.rsg>
 #include <StringLoader.h> 
-#include <aspdefines.h> //For enum TRoamingSettings
+#include <AspDefines.h> //For enum TRoamingSettings
 #include <centralrepository.h> //For central Repository
 
 // ============================== MEMBER FUNCTIONS ============================
diff -r 4f0867e42d62 -r 3e6957da2ff8 omads/omadsappui/OmaDsAppUiPlugin/src/OmaDsAppUiPluginInterface.cpp
--- a/omads/omadsappui/OmaDsAppUiPlugin/src/OmaDsAppUiPluginInterface.cpp	Wed Sep 01 12:30:02 2010 +0100
+++ b/omads/omadsappui/OmaDsAppUiPlugin/src/OmaDsAppUiPluginInterface.cpp	Tue Sep 14 20:55:10 2010 +0300
@@ -33,7 +33,7 @@
 #include "OmaDsAppUiPluginInterface.h"
 #include "gsprivatepluginproviderids.h"
 #include <nsmldssync.mbg>
-#include "NsmlDSGSPluginResource.rsg"
+#include "nsmldsgspluginresource.rsg"
 
 
 _LIT(KNsmlDsIconFileName, "Z:\\resource\\apps\\nsmldssync.mif");
diff -r 4f0867e42d62 -r 3e6957da2ff8 omads/omadsappui/ui/src/NSmlDSSyncAppUi.cpp
--- a/omads/omadsappui/ui/src/NSmlDSSyncAppUi.cpp	Wed Sep 01 12:30:02 2010 +0100
+++ b/omads/omadsappui/ui/src/NSmlDSSyncAppUi.cpp	Tue Sep 14 20:55:10 2010 +0300
@@ -22,7 +22,7 @@
 #include "NSmlDSSyncContainer.h" 
 #include "NSmlDSSyncDocument.h"
 
-#include <NSmlDSSync.rsg>
+#include <nsmldssync.rsg>
 #include "NSmlDSSync.hrh"
 #include "AspDebug.h"
 
diff -r 4f0867e42d62 -r 3e6957da2ff8 omads/omadsextensions/adapters/agenda/src/nsmlagendadataprovider.cpp
--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadataprovider.cpp	Wed Sep 01 12:30:02 2010 +0100
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadataprovider.cpp	Tue Sep 14 20:55:10 2010 +0300
@@ -21,7 +21,7 @@
 #include <ecom.h>
 #include <barsc.h>
 #include <bautils.h>
-#include <NSmlAgendaDataStore_1_1_2.rsg>
+#include <nsmlagendadatastore_1_1_2.rsg>
 #include <SmlDataFormat.h>
 #include <implementationproxy.h>
 #include <data_caging_path_literals.hrh>
diff -r 4f0867e42d62 -r 3e6957da2ff8 omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp
--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Wed Sep 01 12:30:02 2010 +0100
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Tue Sep 14 20:55:10 2010 +0300
@@ -34,7 +34,7 @@
 #include <SmlDataFormat.h>
 #include <SmlDataSyncDefs.h>
 #include <data_caging_path_literals.hrh>
-#include <NSmlAgendaDataStore_1_1_2.rsg>
+#include <nsmlagendadatastore_1_1_2.rsg>
 #include <e32property.h>
 #include <DataSyncInternalPSKeys.h>
 #include <CalenImporter.h>
@@ -656,7 +656,15 @@
             iItemData->Compress();
             iPos = 0;
      
-            iDataMod->StripTxL( *iItemData );
+            TRAPD(error,iDataMod->StripTxL( *iItemData ));
+            if (error)
+                {
+                delete agendautil;
+                delete calfilename;
+                CleanupStack::PopAndDestroy( ); // writeStream
+                User::RequestComplete( iCallerStatus, error);
+                return;
+                }
             delete agendautil;
             delete calfilename;
             }
diff -r 4f0867e42d62 -r 3e6957da2ff8 omads/omadsextensions/adapters/contacts/src/NSmlContactsDataProvider.cpp
--- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataProvider.cpp	Wed Sep 01 12:30:02 2010 +0100
+++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataProvider.cpp	Tue Sep 14 20:55:10 2010 +0300
@@ -28,8 +28,8 @@
 #include <bautils.h>
 #include <SmlDataProvider.h>
 #include <implementationproxy.h>
-#include <NSmlContactsDataStoreFormat_1_1_2.rsg>
-#include <NSmlContactsDataStoreFormat_1_2.rsg>
+#include <nsmlcontactsdatastoreformat_1_1_2.rsg>
+#include <nsmlcontactsdatastoreformat_1_2.rsg>
 #include <data_caging_path_literals.hrh>
 #include <vtoken.h>
 #include <e32property.h>
diff -r 4f0867e42d62 -r 3e6957da2ff8 omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp
--- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp	Wed Sep 01 12:30:02 2010 +0100
+++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp	Tue Sep 14 20:55:10 2010 +0300
@@ -27,8 +27,8 @@
 #include <implementationproxy.h>
 #include <vtoken.h>
 #include <sysutil.h>
-#include <NSmlContactsDataStoreFormat_1_1_2.rsg>
-#include <NSmlContactsDataStoreFormat_1_2.rsg>
+#include <nsmlcontactsdatastoreformat_1_1_2.rsg>
+#include <nsmlcontactsdatastoreformat_1_2.rsg>
 #include <data_caging_path_literals.hrh>
 #include <SmlDataFormat.h>
 #include <SmlDataProvider.h>