--- a/creator/data/creator.rss	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/data/creator.rss	Wed Oct 13 14:32:52 2010 +0300
@@ -1009,7 +1009,7 @@
             id = EAknMessageQueryContentId;
             control = AVKON_MESSAGE_QUERY
             {
-                message = "Version 5.3.6 - 30th August 2010. Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. Licensed under Eclipse Public License v1.0.";
+                message = "Version 5.3.5 - 30th October 2009. Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. Licensed under Eclipse Public License v1.0.";
             };
         }
     };

--- a/creator/inc/creator_browserelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_browserelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -41,7 +41,7 @@
 public:
     static CCreatorBrowserElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
+    
 protected:
     CCreatorBrowserElement(CCreatorEngine* aEngine);    
     TInt GetBrowserCommandL() const;

--- a/creator/inc/creator_calendarelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_calendarelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -102,7 +102,6 @@
 public:
     static CCreatorCalendarElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();    
 protected:
     CCreatorCalendarElement(CCreatorEngine* aEngine);
     

--- a/creator/inc/creator_connectionmethodelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_connectionmethodelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -90,7 +90,7 @@
 public:
     static CCreatorConnectionMethodElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
+    
 protected:
     CCreatorConnectionMethodElement(CCreatorEngine* aEngine);
 };

--- a/creator/inc/creator_contactelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_contactelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -143,7 +143,6 @@
 public:
     static CCreatorContactElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
 protected:
     CCreatorContactElement(CCreatorEngine* aEngine);
 };
@@ -155,7 +154,6 @@
 {
 public:
     static CCreatorContactSetElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
-    void AsyncExecuteCommand();    
     void ExecuteCommandL();
     virtual void AddToCacheL();
 protected:
@@ -169,7 +167,6 @@
 {
 public:
     static CCreatorContactGroupElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
-    void AsyncExecuteCommandL();
     void ExecuteCommandL();
 protected:
     CCreatorContactGroupElement(CCreatorEngine* aEngine);

--- a/creator/inc/creator_fileelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_fileelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -51,7 +51,6 @@
 public:
     static CCreatorFileElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
     
 protected:
     CCreatorFileElement(CCreatorEngine* aEngine);
@@ -64,4 +63,4 @@
     TInt64 iTimeZone;
 };
 
-#endif // CREATORFILEELEMENT_H_
+#endif // CREATORFILEELEMENT_H_
\ No newline at end of file

--- a/creator/inc/creator_impselement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_impselement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -40,7 +40,7 @@
 public:
     static CCreatorImpsServerElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
+    
 protected:
     CCreatorImpsServerElement(CCreatorEngine* aEngine);
 };

--- a/creator/inc/creator_landmarkelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_landmarkelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -47,7 +47,7 @@
 public:
     static CCreatorLandmarkElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
+    
 protected:
     CCreatorLandmarkElement(CCreatorEngine* aEngine);
 };

--- a/creator/inc/creator_logelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_logelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -39,7 +39,7 @@
 public:
     static CCreatorLogElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
+    
 protected:
     CCreatorLogElement(CCreatorEngine* aEngine);
     TInt GetLogCommandL( const TDesC& aFileIdStr, TBool aRandom ) const;

--- a/creator/inc/creator_mailboxelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_mailboxelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -115,7 +115,7 @@
 public:
     static CCreatorMailboxElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
+    
 protected:
     CCreatorMailboxElement(CCreatorEngine* aEngine);
     TBool SetTextParamL(const TDesC& aElemName, const TDesC& aElemContent, CMailboxesParameters* aParams, TBool aSetRandom );

--- a/creator/inc/creator_messageelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_messageelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -58,7 +58,6 @@
 public:
     static CCreatorMessageElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
 protected:    
     CCreatorMessageElement(CCreatorEngine* aEngine);
     /*

--- a/creator/inc/creator_model.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_model.h	Wed Oct 13 14:32:52 2010 +0300
@@ -180,24 +180,9 @@
     		             const CCreatorRandomDataParser::TRandomDataType aRandomDataType);
     void GenerateSourceImageFileL( const TTestDataPath aFileType, const TDesC& aFileName );
     void GenereteSourceTextFileL( const TDesC& aFileName, TInt aSize );
-    
-    /**
-    * CallBack for an asynchronous call of RunScriptL.
-    * @param aObject TAny object.
-    * @return KErrNone or error code.
-    */
-    static TInt AsyncRunScriptCB( TAny* aObject );
-    
 
 public:
     void ExecuteOptionsMenuCommandL(TInt aCommand);
-    
-    /**
-    * It starts asynchronous call of RunScriptL, because it can take a long time
-    * @return None.
-    */
-    void AsyncRunScript();
-    
     void RunScriptL();
     TInt RunScriptL(const TDesC& aScriptFile);
 
@@ -326,7 +311,6 @@
     CImageEncoder* iEncoder;
     CFrameImageData* iFrameImageData;
     CBitmapScaler* iScaler;
-    CAsyncCallBack iAsyncRunScript;
 
 public:
 

--- a/creator/inc/creator_noteelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_noteelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -32,7 +32,6 @@
 public:
     static CCreatorNoteElement* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
     void ExecuteCommandL();
-    void AsyncExecuteCommandL();
     
 protected:
     CCreatorNoteElement(CCreatorEngine* aEngine);

--- a/creator/inc/creator_scriptelement.h	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/inc/creator_scriptelement.h	Wed Oct 13 14:32:52 2010 +0300
@@ -227,16 +227,12 @@
     virtual void AddToCacheL();
     virtual TBool IsCommandElement() const;
     virtual void ExecuteCommandL();
-    
-    void AsyncExecuteCommand();
     //virtual void SaveCommandResultsL();
     //virtual void DiscardCommandResultsL();
     virtual TBool IsRoot() const;
     virtual RPointerArray<CCreatorModuleBaseParameters>& CommandParameters();
     virtual const RPointerArray<CCreatorModuleBaseParameters>& CommandParameters() const;
     
-    void AsyncExecuteCommandAndWaitL();
-    
 protected:
 
     /**
@@ -290,11 +286,6 @@
      */
     void IncreasePhoneNumL( const TDesC& aOriginal, TInt aDelta, HBufC* aIncreased ) const;
     
-    static TInt ExecuteCommandCB( TAny *aPtr );
-    virtual void AsyncExecuteCommandL();
-    void StartNextLoop();
-    void AsyncCommandFinished();
-
 protected:
     
     // Sub-element array
@@ -312,11 +303,6 @@
     TBool iIsRoot;
     CCreatorEngine* iEngine;
     RPointerArray<CCreatorModuleBaseParameters> iParameters;
-    
-    CAsyncCallBack iAsyncCallback;
-    CActiveSchedulerWait iWaiter;
-    volatile TInt iAsyncOpError;
-    TInt iLoopIndex;
 };
 
 /**
@@ -345,4 +331,19 @@
     CCreatorCalendarElementBase(CCreatorEngine* aEngine);
 };
 
+/**
+ * Message elements
+ */
+
+/**
+ * Base class for message elements
+ */
+class CCreatorMessageElementBase : public CCreatorScriptElement
+{
+public:
+    static CCreatorMessageElementBase* NewL(CCreatorEngine* aEngine, const TDesC& aName, const TDesC& aContext = KNullDesC);
+protected:
+    CCreatorMessageElementBase(CCreatorEngine* aEngine);
+};
+
 #endif /*CREATORSCRIPTELEMENT_H_*/

--- a/creator/rom/creator.iby	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/rom/creator.iby	Wed Oct 13 14:32:52 2010 +0300
@@ -35,17 +35,12 @@
 data=ZPRIVATE\20011383\3GPP-70kB.3gpp                   private\20011383\3GPP-70kB.3gpp
 data=ZPRIVATE\20011383\AAC-100kB.aac                    private\20011383\AAC-100kB.aac
 data=ZPRIVATE\20011383\AMR-20kB.amr                     private\20011383\AMR-20kB.amr
-data=ZPRIVATE\20011383\BMP-25kB.bmp                     private\20011383\BMP-25kB.bmp
 data=ZPRIVATE\20011383\Deck-1kB.saveddeck               private\20011383\Deck-1kB.saveddeck
 data=ZPRIVATE\20011383\DOC-20kB.doc                     private\20011383\DOC-20kB.doc
-data=ZPRIVATE\20011383\GIF-2kB.gif                      private\20011383\GIF-2kB.gif
 data=ZPRIVATE\20011383\HTML-20kB.html                   private\20011383\HTML-20kB.html
 data=ZPRIVATE\20011383\JAD-1kB.jad                      private\20011383\JAD-1kB.jad
 data=ZPRIVATE\20011383\JAR-10kB.jar                     private\20011383\JAR-10kB.jar
 data=ZPRIVATE\20011383\JP2-65kB.jp2                     private\20011383\JP2-65kB.jp2
-data=ZPRIVATE\20011383\JPEG-200kB.jpg                   private\20011383\JPEG-200kB.jpg
-data=ZPRIVATE\20011383\JPEG-25kB.jpg                    private\20011383\JPEG-25kB.jpg
-data=ZPRIVATE\20011383\JPEG-500kB.jpg                   private\20011383\JPEG-500kB.jpg
 data=ZPRIVATE\20011383\MIDI-10kB.mid                    private\20011383\MIDI-10kB.mid
 data=ZPRIVATE\20011383\MP3-250kB.mp3                    private\20011383\MP3-250kB.mp3
 data=ZPRIVATE\20011383\MP4-200kB.mp4                    private\20011383\MP4-200kB.mp4
@@ -58,8 +53,6 @@
 data=ZPRIVATE\20011383\SVG-15kB.svg                     private\20011383\SVG-15kB.svg
 data=ZPRIVATE\20011383\SWF-15kB.swf                     private\20011383\SWF-15kB.swf
 data=ZPRIVATE\20011383\TIF-25kB.tif                     private\20011383\TIF-25kB.tif
-data=ZPRIVATE\20011383\TXT-10kB.txt                     private\20011383\TXT-10kB.txt
-data=ZPRIVATE\20011383\TXT-70kB.txt                     private\20011383\TXT-70kB.txt
 data=ZPRIVATE\20011383\VCF-1kB.vcf                      private\20011383\VCF-1kB.vcf
 data=ZPRIVATE\20011383\VCS-1kB.vcs                      private\20011383\VCS-1kB.vcs
 data=ZPRIVATE\20011383\WAV-20kB.wav                     private\20011383\WAV-20kB.wav

--- a/creator/sis/Creator_stub.pkg	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/sis/Creator_stub.pkg	Wed Oct 13 14:32:52 2010 +0300
@@ -68,5 +68,3 @@
 ""-"z:\private\20011383\WAV-20kB.wav"
 ""-"z:\private\20011383\XLS-15kB.xls"
 ""-"z:\private\20011383\SISX-10kB.sisx"
-""-"z:\private\20011383\WMA-50kB.wma"
-""-"z:\private\20011383\WMV-200kB.wmv"

--- a/creator/src/creator_appui.cpp	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/src/creator_appui.cpp	Wed Oct 13 14:32:52 2010 +0300
@@ -146,7 +146,7 @@
         // run script
         case ECmdCreateFromFile:
             {
-            iEngine->AsyncRunScript();
+            iEngine->RunScriptL();
 			}
 			break;
 

--- a/creator/src/creator_browserelement.cpp	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/src/creator_browserelement.cpp	Wed Oct 13 14:32:52 2010 +0300
@@ -44,140 +44,6 @@
     iIsCommandElement = ETrue;
     }
 
-void CCreatorBrowserElement::AsyncExecuteCommandL()
-    {
-    const CCreatorScriptAttribute* amountAttr = FindAttributeByName(KAmount);
-    TInt entryAmount = 1;
-    if( amountAttr )
-        {
-        entryAmount = ConvertStrToIntL(amountAttr->Value());
-        }
-    // Get 'fields' element 
-    CCreatorScriptElement* fieldsElement = FindSubElement(KFields);
-    if( fieldsElement && fieldsElement->SubElements().Count() > 0 )
-        {
-        // Get sub-elements
-        const RPointerArray<CCreatorScriptElement>& fields = fieldsElement->SubElements();
-        // Create browser entries, the amount of entries is defined by entryAmount:
-        if( iLoopIndex < entryAmount )
-            {
-            CBrowserParameters* param = new (ELeave) CBrowserParameters;
-            CleanupStack::PushL(param);
-            
-            for( TInt i = 0; i < fields.Count(); ++i )
-                {
-                CCreatorScriptElement* field = fields[i];
-                TPtrC elemName = field->Name();                
-                TPtrC elemContent = field->Content();
-                const CCreatorScriptAttribute* randomAttr = fields[i]->FindAttributeByName(KRandomLength);
-                if( elemName == KName )
-                    {
-                    if( randomAttr || elemContent.Length() == 0)
-                        {
-                        elemContent.Set(iEngine->RandomString(CCreatorEngine::ECompany));
-                        }
-                    if( iName->Des() == KBookmark )
-                        {
-                        SetContentToTextParamL(param->iBookmarkName, elemContent);                        
-                        }
-                    else if( iName->Des() == KBookmarkFolder )
-                        {
-                        SetContentToTextParamL(param->iBookmarkFolderName, elemContent);
-                        }
-                    else if( iName->Des() == KSavedPage )
-                        {
-                        SetContentToTextParamL(param->iSavedDeckLinkName, elemContent);
-                        }
-                    else if( iName->Des() == KSavedPageFolder )
-                        {
-                        SetContentToTextParamL(param->iSavedDeckFolderName, elemContent);
-                        }
-                    }
-                
-                else if( elemName == KPath )
-                    {                    
-                    if( randomAttr || elemContent.Length() == 0)
-                        {
-                        SetContentToTextParamL(param->iSavedDeckLocalAddress, iEngine->TestDataPathL(CCreatorEngine::ESavedDeck_1kB));
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iSavedDeckLocalAddress, elemContent);
-                        }
-                    }
-                else if( elemName == KUsername )
-                    {
-                    if( randomAttr || elemContent.Length() == 0)
-                        {
-                        // Set username and password to same string
-                        if( param->iBookmarkPassword && param->iBookmarkPassword->Length() > 0 )
-                            {
-                            SetContentToTextParamL(param->iBookmarkUsername, param->iBookmarkPassword->Des());
-                            }
-                        else
-                            {
-                            SetContentToTextParamL(param->iBookmarkUsername, iEngine->RandomString(CCreatorEngine::EFirstName));
-                            }
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iBookmarkUsername, elemContent);
-                        }
-                    }
-                else if( elemName == KPassword )
-                    {
-                    if( randomAttr || elemContent.Length() == 0)
-                        {
-                        // Set username and password to same string
-                        if( param->iBookmarkUsername && param->iBookmarkUsername->Length() > 0 )
-                            {
-                            SetContentToTextParamL(param->iBookmarkPassword, param->iBookmarkUsername->Des());
-                            }
-                        else
-                            {
-                            SetContentToTextParamL(param->iBookmarkPassword, iEngine->RandomString(CCreatorEngine::EFirstName));                                                    
-                            }
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iBookmarkPassword, elemContent);
-                        }
-                    }
-                else if( elemName == KUrl )
-                    {
-                    if( randomAttr || elemContent.Length() == 0)
-                        {
-                        TDesC* tmpUrl = iEngine->CreateHTTPUrlLC();
-                        if( tmpUrl )
-                            {
-                            SetContentToTextParamL(param->iBookmarkAddress, *tmpUrl );
-                            }
-                        CleanupStack::PopAndDestroy(); // tmpUrl                        
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iBookmarkAddress, elemContent);
-                        }
-                    }
-                }
-            iEngine->AppendToCommandArrayL(GetBrowserCommandL(), param);
-            CleanupStack::Pop(); // param
-            StartNextLoop();
-            }
-        else
-            {
-            // stop loop and signal end of the executing command
-            AsyncCommandFinished();
-            }
-        }
-    else
-        {
-        // No fields defined --> Add all fields with random values:
-        iEngine->AppendToCommandArrayL(GetBrowserCommandL(), 0, entryAmount);
-        // signal end of the executing command
-        AsyncCommandFinished();
-        }
-    }
 
 /*
  * 
@@ -193,14 +59,24 @@
         }
     // Get 'fields' element 
     CCreatorScriptElement* fieldsElement = FindSubElement(KFields);
-    if( fieldsElement && fieldsElement->SubElements().Count() > 0 )
+    if( fieldsElement )
         {
         // Get sub-elements
         const RPointerArray<CCreatorScriptElement>& fields = fieldsElement->SubElements();
         // Create browser entries, the amount of entries is defined by entryAmount:
         for( TInt cI = 0; cI < entryAmount; ++cI )
             {
-            CBrowserParameters* param = new (ELeave) CBrowserParameters;
+            CBrowserParameters* param = 0;
+            
+            if( fields.Count() > 0 )
+            	param = new (ELeave) CBrowserParameters;
+            else
+            	{
+            	// No fields defined --> Add all fields with random values:
+            	addAll = ETrue;
+            	break;
+            	}
+            
             CleanupStack::PushL(param);
             
             for( TInt i = 0; i < fields.Count(); ++i )
@@ -305,7 +181,6 @@
         }
     else
     	{
-        // No fields defined --> Add all fields with random values:
     	addAll = ETrue;
     	}
     

--- a/creator/src/creator_calendarelement.cpp	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/src/creator_calendarelement.cpp	Wed Oct 13 14:32:52 2010 +0300
@@ -488,125 +488,6 @@
         }    
     }
 
-void CCreatorCalendarElement::AsyncExecuteCommandL()
-    {
-    LOGSTRING("Creator: CCreatorCalendarElement::AsyncExecuteCommandL");
-    // Amount of calendar entries:
-    const CCreatorScriptAttribute* calEntryAmountAttr = this->FindAttributeByName(KAmount);
-    const CCreatorScriptAttribute* calEntryTypeAttr = this->FindAttributeByName(KType);    
-    TInt entryAmount = 1;    
-    if( calEntryAmountAttr )
-        {
-        entryAmount = ConvertStrToIntL(calEntryAmountAttr->Value());
-        }
-    if( calEntryTypeAttr == 0 )
-        {
-        LOGSTRING("ERROR in CCreatorCalendarElement::AsyncExecuteCommandL: Type attribute is missing.");
-        User::Leave(KErrGeneral); // type is required attribute
-        }
-
-    // Find fields element:
-    CCreatorScriptElement* fieldsElement = FindSubElement(KFields);
-    
-    if( iLoopIndex < entryAmount )
-        {
-        CCalenderInterimParameters* param = new (ELeave) CCalenderInterimParameters;
-        CleanupStack::PushL(param);
-        if( CompareIgnoreCase(calEntryTypeAttr->Value(), KCalTypeAppointment) == 0 )
-            {
-            if( fieldsElement && fieldsElement->SubElements().Count() > 0 )
-                {
-                FillEntryParamsL(EAppointment, fieldsElement->SubElements(), param);
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryAppointments, param);
-                }
-            else
-                {
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryAppointments, 0, entryAmount);
-                CleanupStack::PopAndDestroy(param);
-                // We can step out from the for-loop, because the amount is given to engine.
-                // stop loop and signal end of the executing command
-                AsyncCommandFinished();
-                return;
-                }
-            }       
-        else if( CompareIgnoreCase(calEntryTypeAttr->Value(), KCalTypeEvent ) == 0 )
-            {
-            if( fieldsElement && fieldsElement->SubElements().Count() > 0 )
-                {
-                FillEntryParamsL(EEvent, fieldsElement->SubElements(), param);
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryEvents, param);
-                }
-            else
-                {
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryEvents, 0, entryAmount);
-                CleanupStack::PopAndDestroy(param);
-                // We can step out from the for-loop, because the amount is given to engine.
-                // stop loop and signal end of the executing command
-                AsyncCommandFinished();
-                return;
-                }
-            }
-        else if( CompareIgnoreCase(calEntryTypeAttr->Value(), KCalTypeReminder ) == 0 )
-            {
-            if( fieldsElement && fieldsElement->SubElements().Count() > 0 )
-                {
-                FillEntryParamsL(EReminder, fieldsElement->SubElements(), param);
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryReminders, param);
-                }
-            else
-                {
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryReminders, 0, entryAmount);
-                CleanupStack::PopAndDestroy(param);
-                // We can step out from the for-loop, because the amount is given to engine.
-                // stop loop and signal end of the executing command
-                AsyncCommandFinished();
-                return;
-                }
-            }
-        else if( CompareIgnoreCase(calEntryTypeAttr->Value(), KCalTypeAnniversary ) == 0 )
-            {
-            if( fieldsElement && fieldsElement->SubElements().Count() > 0 )
-                {
-                FillEntryParamsL(EAnniversary, fieldsElement->SubElements(), param);
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryAnniversaries, param);
-                }
-            else
-                {
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryAnniversaries, 0, entryAmount);
-                CleanupStack::PopAndDestroy(param);
-                // We can step out from the for-loop, because the amount is given to engine.
-                // stop loop and signal end of the executing command
-                AsyncCommandFinished();
-                return;
-                }
-            }
-        else if( CompareIgnoreCase(calEntryTypeAttr->Value(), KCalTypeTodo ) == 0 )
-            {
-            if( fieldsElement && fieldsElement->SubElements().Count() > 0 )
-                {
-                FillEntryParamsL(ETodo, fieldsElement->SubElements(), param);
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryToDos, param);
-                }
-            else
-                {
-                iEngine->AppendToCommandArrayL(ECmdCreateCalendarEntryToDos, 0, entryAmount);
-                CleanupStack::PopAndDestroy(param);
-                // We can step out from the for-loop, because the amount is given to engine.
-                // stop loop and signal end of the executing command
-                AsyncCommandFinished();
-                return;
-                }
-            }
-        CleanupStack::Pop(); // param
-        StartNextLoop();
-        }
-    else
-        {
-        // stop loop and signal end of the executing command
-        AsyncCommandFinished();
-        }
-    }
-
 void CCreatorCalendarElement::ExecuteCommandL()
 	{
 	LOGSTRING("Creator: CCreatorCalendarElement::ExecuteCommandL");

--- a/creator/src/creator_connectionmethodelement.cpp	Wed Sep 15 12:13:45 2010 +0300
+++ b/creator/src/creator_connectionmethodelement.cpp	Wed Oct 13 14:32:52 2010 +0300
@@ -60,423 +60,6 @@
     }
 
 #if(!defined __SERIES60_30__ && !defined __SERIES60_31__)
-void CCreatorConnectionMethodElement::AsyncExecuteCommandL()
-    {
-    const CCreatorScriptAttribute* amountAttr = FindAttributeByName(KAmount);
-    TInt cmAmount = 1;    
-    if( amountAttr )
-        {
-        cmAmount = ConvertStrToIntL(amountAttr->Value());
-        }
-    // Get 'fields' element 
-    CCreatorScriptElement* fieldsElement = FindSubElement(KFields);
-    if( fieldsElement && fieldsElement->SubElements().Count() > 0 )
-        {
-        // Get sub-elements
-        const RPointerArray<CCreatorScriptElement>& fields = fieldsElement->SubElements();        
-        // Create connection method entries, the amount of entries is defined by cmAmount:
-        if( iLoopIndex < cmAmount )
-            {            
-            CConnectionSettingsParameters* param = new (ELeave) CConnectionSettingsParameters;
-            CleanupStack::PushL(param);
-            
-            for( TInt i = 0; i < fields.Count(); ++i )
-                {
-                CCreatorScriptElement* field = fields[i];
-                TPtrC elemName = field->Name();
-                TPtrC elemContent = field->Content();
-                const CCreatorScriptAttribute* randomAttr = fields[i]->FindAttributeByName(KRandomLength);
-                TBool useRandom = EFalse;
-                if( randomAttr || elemContent.Length() == 0 )
-                    {
-                    useRandom = ETrue;
-                    }
-                
-                if( elemName == Kconnectionname )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomCMNameL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iConnectionName, elemContent);
-                        // reserve extra space for possible renaming
-                        TInt newLen = param->iConnectionName->Length() + KExtraSpace;
-                        param->iConnectionName = param->iConnectionName->ReAllocL(newLen);
-                        }
-                    }
-                else if( elemName == Kstartpage )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomStartPageL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iStartPage, elemContent);
-                        }
-                    }
-                else if( elemName == Kwapwspoption )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomWapWspOptionL(*iEngine);
-                        }
-                    else
-                        {
-                        if( CompareIgnoreCase(elemContent, Kconnectionless) == 0 )
-                            {
-                            param->iWapWspOption = ECmWapWspOptionConnectionless;
-                            }
-                        else if( CompareIgnoreCase(elemContent, Kconnectionoriented) == 0 )
-                            {
-                            param->iWapWspOption = ECmWapWspOptionConnectionOriented;
-                            }
-                        }
-                    }
-                else if( elemName == Kprotocoltype )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomProtocolTypeL(*iEngine);
-                        }
-                    else
-                        {
-                        if( CompareIgnoreCase(elemContent, Kipv4) == 0 )
-                            {
-                            param->iProtocolType = RPacketContext::EPdpTypeIPv4;
-                            }
-                        else if( CompareIgnoreCase(elemContent, Kipv6) == 0 )
-                            {
-                            param->iProtocolType = RPacketContext::EPdpTypeIPv6;
-                            }
-                        }
-                    }
-                else if( elemName == Kloginname )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomLoginNameL(*iEngine);                       
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iLoginName, elemContent);
-                        }
-                    }
-                else if( elemName == Ksecureauthentication )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomSecureAuthenticationL(*iEngine);
-                        }
-                    else
-                        {
-                        param->iSecureAuthentication = ConvertStrToBooleanL(elemContent);
-                        }
-                    }
-                else if( elemName == Kloginpass )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomLoginPassL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iLoginPass, elemContent);
-                        }
-                    }
-                else if( elemName == Kpromptpassword )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomPromptPasswordL(*iEngine);
-                        }
-                    else
-                        {
-                        param->iPromptPassword = ConvertStrToBooleanL(elemContent);
-                        }
-                    }
-                else if( elemName == Kgatewayaddress )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomGatewayAddressL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iGatewayAddress, elemContent);
-                        }
-                    }
-                else if( elemName == Ksubnetmask )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomSubnetMaskL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iSubnetMask, elemContent);
-                        }
-                    }
-                else if( elemName == Kdeviceipaddr )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomIPAddressL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iIPAddr, elemContent);
-                        }
-                    }
-                else if( elemName == Kip4nameserver1 )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomIP4NameServer1L(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iIP4NameServer1, elemContent);
-                        }
-                    }
-                else if( elemName == Kip4nameserver2 )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomIP4NameServer2L(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iIP4NameServer2, elemContent);
-                        }
-                    }
-                else if( elemName == Kdatacalltelnumber )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomTelephoneNumberL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iDefaultTelNumber, elemContent);
-                        }
-                    }
-                else if( elemName == Kdatacalltypeisdn )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomBearerTypeIsdnL(*iEngine);
-                        }
-                    else
-                        {
-                        if( CompareIgnoreCase(elemContent, Kanalogue) == 0 )
-                            param->iBearerCallTypeIsdn = CMManager::ECmCallTypeAnalogue;
-                        else if( CompareIgnoreCase( elemContent, Kisdnv110) == 0 )
-                            param->iBearerCallTypeIsdn = CMManager::ECmCallTypeISDNv110;
-                        else if( CompareIgnoreCase( elemContent, Kisdnv120) == 0 )
-                            param->iBearerCallTypeIsdn = CMManager::ECmCallTypeISDNv120;
-                        }
-                    }
-                else if( elemName == Kbearertype )
-                    {
-                    if( useRandom )
-                        {
-                        param->iBearerType = KRandomBearerType;
-                        }
-                    else
-                        {
-                        if( CompareIgnoreCase(elemContent, Kwlan) == 0 )
-                            {
-                            param->iBearerType = KUidWlanBearerType;
-                            }
-                        else if( CompareIgnoreCase(elemContent, Kgprs) == 0 )
-                            {
-                            param->iBearerType = KUidPacketDataBearerType;
-                            }
-                        else if( CompareIgnoreCase(elemContent, Kdatacall) == 0 )
-                            {
-                            param->iBearerType = KUidCSDBearerType;
-                            }
-                        else if( CompareIgnoreCase(elemContent, Khsgsm) == 0 )
-                            {
-                            param->iBearerType = KUidHSCSDBearerType;
-                            }
-                        else if( CompareIgnoreCase(elemContent, Kembedded) == 0 )
-                            {
-                            param->iBearerType = KUidEmbeddedDestination;
-                            }
-                        else if( CompareIgnoreCase(elemContent, Kvpn) == 0 )
-                            {
-                            param->iBearerType = KPluginVPNBearerTypeUid;
-                            }
-                        else if( CompareIgnoreCase(elemContent, Klan) == 0 )
-                            {
-                            param->iBearerType = KUidLanBearerType;
-                            }
-                        }
-                    }
-                else if( elemName == Kdatacalllinespeed )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomBearerSpeedL(*iEngine);
-                        }
-                    else
-                        {
-                        if( CompareIgnoreCase(elemContent, Kautomatic) == 0 )
-                            {                            
-                            param->iBearerSpeed = CMManager::ECmSpeedAutobaud;
-                            }
-                        else
-                            {
-                            TUint lineSpeed = ConvertStrToUintL(elemContent);
-                            if( lineSpeed == 9600 )
-                                param->iBearerSpeed = CMManager::ECmSpeed9600;
-                            else if( lineSpeed == 14400 )
-                                param->iBearerSpeed = CMManager::ECmSpeed14400;
-                            else if( lineSpeed == 19200 )
-                                param->iBearerSpeed = CMManager::ECmSpeed19200;
-                            else if( lineSpeed == 28800 )
-                                param->iBearerSpeed = CMManager::ECmSpeed28800;
-                            else if( lineSpeed == 38400 )
-                                param->iBearerSpeed = CMManager::ECmSpeed38400;
-                            else if( lineSpeed == 43200 )
-                                param->iBearerSpeed = CMManager::ECmSpeed43200;
-                            else if( lineSpeed == 56000 )
-                                param->iBearerSpeed = CMManager::ECmSpeed56000;
-                            }                           
-                        }
-                    }
-                else if( elemName == Kuseproxy )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomUseProxyL(*iEngine);
-                        }
-                    else
-                        {
-                        param->iUseProxy = ConvertStrToBooleanL(elemContent);
-                        }
-                    }
-                else if( elemName == Kproxyserveraddress )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomProxyAddressL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iProxyServerAddress, elemContent);                        
-                        }
-                    }
-                else if( elemName == Kproxyportnumber )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomProxyPortL(*iEngine);
-                        }
-                    else
-                        {
-                        param->iProxyPortNumber = ConvertStrToUintL(elemContent);                       
-                        }
-                    }
-                else if( elemName == Kip6nameserver1 )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomIPv6NameServer1L(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iIP6NameServer1, elemContent);                                            
-                        }
-                    }
-                else if( elemName == Kip6nameserver2 )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomIPv6NameServer2L(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iIP6NameServer2, elemContent);                                            
-                        }
-                    }
-                else if( elemName == Kdisabletextauth )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomDisableTextAuthL(*iEngine);
-                        }
-                    else
-                        {
-                        param->iDisableTextAuth = ConvertStrToBooleanL(elemContent);
-                        }
-                    }
-                else if( elemName == Kwlanname )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomWLANNameL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iWLANName, elemContent);                                              
-                        }
-                    }
-                else if( elemName == Kwlanipaddr )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomWlanIpAddrL(*iEngine);
-                        }
-                    else
-                        {
-                        SetContentToTextParamL(param->iWlanIpAddr, elemContent);                                            
-                        }
-                    }
-                else if( elemName == Kwlansecmode )
-                    {
-                    if( useRandom )
-                        {
-                        param->SetRandomWLANSecurityModeL(*iEngine);
-                        }
-                    else
-                        {
-                        if( CompareIgnoreCase(elemContent, Kopen) == 0)
-                            param->iWLanSecMode = CMManager::EWlanSecModeOpen;
-                        else if( CompareIgnoreCase(elemContent, Kwep) == 0 )
-                            param->iWLanSecMode = CMManager::EWlanSecModeWep;
-                        else if( CompareIgnoreCase(elemContent, Ke802_1x) == 0 )
-                            param->iWLanSecMode = CMManager::EWlanSecMode802_1x;
-                        else if( CompareIgnoreCase(elemContent, Kwpa) == 0 )
-                            param->iWLanSecMode = CMManager::EWlanSecModeWpa;
-                        else if( CompareIgnoreCase(elemContent, Kwpa2) == 0 )
-                            param->iWLanSecMode = CMManager::EWlanSecModeWpa2;                                                                  
-                        }
-                    }
-                }
-            iEngine->AppendToCommandArrayL(ECmdCreateMiscEntryAccessPoints, param);
-            CleanupStack::Pop(); // param
-            StartNextLoop();
-            }
-        else
-            {
-            // stop loop and signal end of the executing command
-            AsyncCommandFinished();
-            }
-        }
-    else
-        {
-        // No fields defined so add random entries:
-        iEngine->AppendToCommandArrayL(ECmdCreateMiscEntryAccessPoints, 0, cmAmount);
-        // signal end of the executing command
-        AsyncCommandFinished();
-        }
-    }
-
 void CCreatorConnectionMethodElement::ExecuteCommandL()
     {
     const CCreatorScriptAttribute* amountAttr = FindAttributeByName(KAmount);