201025
authorhgs
Tue, 13 Jul 2010 09:26:23 +0530
changeset 49 689a71addb96
parent 48 7e865e817571
child 50 a36219ae6585
201025
syncmlfw/syncmlnotifier/BWINS/SyncMLNotifieru.def
syncmlfw/syncmlnotifier/appserver/SyncMLNotifierAppserver.mmp
syncmlfw/syncmlnotifier/appserver/SyncMLNotifierAppserver.rss
syncmlfw/syncmlnotifier/appserver/SyncMLNotifierServerApplication.cpp
syncmlfw/syncmlnotifier/appserver/SyncMLNotifierServerApplication.h
syncmlfw/syncmlnotifier/appserver/SyncMLNotifierappserver_reg.rss
syncmlfw/syncmlnotifier/cenrep/keys_syncmlnotifier.xls
syncmlfw/syncmlnotifier/conf/syncmlnotifier.confml
syncmlfw/syncmlnotifier/conf/syncmlnotifier_101F8769.crml
syncmlfw/syncmlnotifier/data/SyncMLNotifier.rss
syncmlfw/syncmlnotifier/eabi/SyncMLNotifieru.def
syncmlfw/syncmlnotifier/ecom/101F876A.rss
syncmlfw/syncmlnotifier/ecom/SyncMLNotifierWrapper.cpp
syncmlfw/syncmlnotifier/ecom/SyncMLNotifierWrapper.mmp
syncmlfw/syncmlnotifier/group/101F8769.txt
syncmlfw/syncmlnotifier/group/SyncMLNotifier.mmp
syncmlfw/syncmlnotifier/group/bld.inf
syncmlfw/syncmlnotifier/inc/SyncMLAknPopUplist.h
syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h
syncmlfw/syncmlnotifier/inc/SyncMLDlgNotifier.h
syncmlfw/syncmlnotifier/inc/SyncMLFwUpdNotifier.h
syncmlfw/syncmlnotifier/inc/SyncMLMessageQueryDialog.h
syncmlfw/syncmlnotifier/inc/SyncMLNotifDebug.h
syncmlfw/syncmlnotifier/inc/SyncMLNotifPrivateCRKeys.h
syncmlfw/syncmlnotifier/inc/SyncMLNotifier.hrh
syncmlfw/syncmlnotifier/inc/SyncMLNotifierBase.h
syncmlfw/syncmlnotifier/inc/SyncMLQueryDialog.h
syncmlfw/syncmlnotifier/inc/SyncMLQueryTimer.h
syncmlfw/syncmlnotifier/inc/SyncMLTimedDateQuery.h
syncmlfw/syncmlnotifier/inc/SyncMLTimedInputTextQuery.h
syncmlfw/syncmlnotifier/inc/SyncMLTimedMessageQuery.h
syncmlfw/syncmlnotifier/inc/SyncMLTimedNumberQueryDialog.h
syncmlfw/syncmlnotifier/inc/SyncMLTimedQueryDialog.h
syncmlfw/syncmlnotifier/inc/syncmlmmcwatcher.h
syncmlfw/syncmlnotifier/loc/SyncMLNotifier.loc
syncmlfw/syncmlnotifier/loc/SyncMLNotifierFota.loc
syncmlfw/syncmlnotifier/rom/SyncMLNotifier.iby
syncmlfw/syncmlnotifier/rom/SyncMLNotifierResources.iby
syncmlfw/syncmlnotifier/src/SyncMLAknPopUpList.cpp
syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp
syncmlfw/syncmlnotifier/src/SyncMLDlgNotifier.cpp
syncmlfw/syncmlnotifier/src/SyncMLFwUpdNotifier.cpp
syncmlfw/syncmlnotifier/src/SyncMLMessageQueryDialog.cpp
syncmlfw/syncmlnotifier/src/SyncMLNotifierBase.cpp
syncmlfw/syncmlnotifier/src/SyncMLNotifierMain.cpp
syncmlfw/syncmlnotifier/src/SyncMLQueryDialog.cpp
syncmlfw/syncmlnotifier/src/SyncMLQueryTimer.cpp
syncmlfw/syncmlnotifier/src/SyncMLTimedDateQuery.cpp
syncmlfw/syncmlnotifier/src/SyncMLTimedInputTextQuery.cpp
syncmlfw/syncmlnotifier/src/SyncMLTimedMessageQuery.cpp
syncmlfw/syncmlnotifier/src/SyncMLTimedNumberQueryDialog.cpp
syncmlfw/syncmlnotifier/src/SyncMLTimedQueryDialog.cpp
syncmlfw/syncmlnotifier/src/syncmlmmcwatcher.cpp
syncmlfw/syncservice/BWINS/SyncServiceu.def
syncmlfw/syncservice/INC/SyncServiceDebug.h
syncmlfw/syncservice/SRC/SyncService.cpp
syncmlfw/syncservice/SRC/SyncServiceSession.cpp
syncmlfw/syncservice/eabi/SyncServiceu.def
syncmlfw/syncservice/group/SyncService.mmp
syncmlfw/syncservice/group/bld.inf
syncmlfw/syncservice/rom/syncservice.iby
--- a/syncmlfw/syncmlnotifier/BWINS/SyncMLNotifieru.def	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NotifierArray@@YAPAV?$CArrayPtr@VMEikSrvNotifierBase2@@@@XZ @ 1 NONAME ; class CArrayPtr<class MEikSrvNotifierBase2> * NotifierArray(void)
-
--- a/syncmlfw/syncmlnotifier/appserver/SyncMLNotifierAppserver.mmp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2005 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:  This is project specification file for appserver for 
-*                 the BTNotif Ecom Plugins.
-*
-*/
-
-#include  <platform_paths.hrh>
-
-TARGET          SyncMLNotifierAppServer.exe
-
-EPOCSTACKSIZE   0x5000
-TARGETTYPE      exe
-UID             0x100039ce 0x102072bf
-
-VENDORID        VID_DEFAULT
-
-CAPABILITY      CAP_APPLICATION // define cap needed by your notifier here
-
-SOURCEPATH      .
-SOURCE          SyncMLNotifierServerApplication.cpp
-
-START RESOURCE ./syncmlnotifierappserver_reg.rss
-// Do not change the UID below.
-TARGETPATH /private/10003a3f/apps
-LANGUAGE_IDS
-END
-
-USERINCLUDE     . ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY         euser.lib 
-LIBRARY         apparc.lib 
-LIBRARY         cone.lib 
-LIBRARY         eikcore.lib
-LIBRARY         avkon.lib 
-LIBRARY         aknnotifierwrapper.lib
-
-DEBUGLIBRARY    flogger.lib
-
-SMPSAFE
--- a/syncmlfw/syncmlnotifier/appserver/SyncMLNotifierAppserver.rss	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2005 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: Implementation of syncmlnotifier component
-* 	This is part of syncmlnotifier.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    SNAS
-
-//  INCLUDES
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <avkon.rsg>
-#include <avkon.hrh>
-
-//  RESOURCE DEFINITIONS 
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf = "SyncMLNotifierAppServer"; }
-
-RESOURCE EIK_APP_INFO
-	{
-	}
\ No newline at end of file
--- a/syncmlfw/syncmlnotifier/appserver/SyncMLNotifierServerApplication.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Declares SyncML notifiers server application class.
-*
-*/
-
-
-// INCLUDE FILES
-#include "SyncMLNotifierServerApplication.h"
-#include "SyncMLNotifDebug.h"
-
-// CONSTANTS
-_LIT( KSmlNotifierLibraryFileName,  "SyncMLNotifier.dll" );
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// NewApplication Creates a new notifier server application.
-// -----------------------------------------------------------------------------
-//
-LOCAL_C CApaApplication* NewApplication()
-	{
-	FLOG(_L("[SmlNotif]\t NewApplication()"));
-	return new CSyncMLNotifierServerApplication();
-	}	
-	
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierServerApplication::CSyncMLNotifierServerApplication
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLNotifierServerApplication::CSyncMLNotifierServerApplication()
-	{
-	FLOG(_L("[SmlNotif]\t CSyncMLNotifierServerApplication::CreateDocumentL()"));
-	}
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierServerApplication::NewAppServerL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLNotifierServerApplication::NewAppServerL( CApaAppServer*& aAppServer )
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLNotifierServerApplication::NewAppServerL()"));
-    CAknNotifierAppServer* server = new (ELeave) CAknNotifierAppServer();
-    CleanupStack::PushL(server);
-
-    server->AppendNotifierLibNameL( KSmlNotifierLibraryFileName );
-    server->LoadNotifiersL();
-    CleanupStack::Pop( server );
-    aAppServer = &*server;
-    FLOG(_L("[SmlNotif]\t CSyncMLNotifierServerApplication::NewAppServerL() completed"));
-    }
-        
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierServerApplication::CreateDocumentL
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CSyncMLNotifierServerApplication::CreateDocumentL()
-	{
-	FLOG(_L("[SmlNotif]\t CSyncMLNotifierServerApplication::CreateDocumentL()"));
-	return new (ELeave) CSyncMLNotifierAppServerDocument( *this );
-	}
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierAppServerDocument::CreateAppUiL
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CSyncMLNotifierAppServerDocument::CreateAppUiL()
-	{
-	FLOG(_L("[SmlNotif]\t CSyncMLNotifierAppServerDocument::CreateAppUiL()"));
-	return new (ELeave) CSyncMLNotifierAppServerAppUi();
-	}
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierAppServerAppUi::CSyncMLNotifierAppServerAppUi
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLNotifierAppServerAppUi::CSyncMLNotifierAppServerAppUi()
-	{
-	FLOG(_L("[SmlNotif]\t CSyncMLNotifierAppServerAppUi::CSyncMLNotifierAppServerAppUi()"));
-	}
-
-// Destructor
-CSyncMLNotifierAppServerAppUi::~CSyncMLNotifierAppServerAppUi()
-	{
-	FLOG(_L("[SmlNotif]\t CSyncMLNotifierAppServerAppUi::~CSyncMLNotifierAppServerAppUi()"));
-	}
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierAppServerAppUi::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLNotifierAppServerAppUi::ConstructL()
-	{
-	FLOG(_L("[SmlNotif]\t CSyncMLNotifierAppServerAppUi::ConstructL()"));
-	// base call
-	CAknNotifierAppServerAppUi::ConstructL();
-	FLOG(_L("[SmlNotif]\t CSyncMLNotifierAppServerAppUi::ConstructL() completed"));
-	}
-	
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// E32Main
-// -----------------------------------------------------------------------------
-//
-GLDEF_C TInt E32Main()
-    {
-    return EikStart::RunApplication( NewApplication );
-    }
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/appserver/SyncMLNotifierServerApplication.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Declares SyncML notifiers server application class.
-*
-*/
-
-
-
-#ifndef SYNCMLNOTIFIERSERVERAPPLICATION_H
-#define SYNCMLNOTIFIERSERVERAPPLICATION_H
-
-//  INCLUDES
-#include <AknNotiferAppServerApplication.h> 
-#include <AknNotifierAppServer.h>
-#include <eikstart.h>
-
-// CONSTANTS
-const TUid KSyncMLNotifierAppServerUid = { 0x102072bf };
-
-// CLASS DECLARATION
-
-/**
-*  Server application, in which the notifiers are executed.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-class CSyncMLNotifierServerApplication: public CAknNotifierAppServerApplication
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLNotifierServerApplication();
- 
-    public: // New functions
-        
-        /**
-        * Returns the resource file name of the object. Returns
-        * an empty string, since component has no resource file.
-        * @since Series 60 3.0
-        * @param None
-        * @return Resource file name.
-        */
-        TFileName ResourceFileName() const { TBuf<1> buf; return buf; }
-
-    public: // Functions from base classes
- 
-        /**
-        * From CAknApplication
-        * @since Series 60 3.0
-        * @param aAppaServer 
-        * @return None.
-        */
-        void NewAppServerL( CApaAppServer*& aAppServer );
- 
-        /**
-        * From CAknApplication Creates the application server document
-        * instance.
-        * @since Series 60 3.0
-        * @param None
-        * @return Pointer to the created document instance.
-        */
-        CApaDocument* CreateDocumentL();
- 
-        /**
-        * From CApaApplication Returns the application server uid.
-        * @since Series 60 3.0
-        * @param None
-        * @return Application server uid.
-        */
-        TUid AppDllUid() const { return KSyncMLNotifierAppServerUid; } 
-    };
-
-/**
-*  Document instance for notifier server application.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-class CSyncMLNotifierAppServerDocument: public CAknDocument
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLNotifierAppServerDocument( CEikApplication& aApp )
-            : CAknDocument( aApp ) {};
-        
-    protected:  // Functions from base classes
- 
-        /**
-        * From CAknDocument Creates the application server UI
-        * instance.
-        * @since Series 60 3.0
-        * @param None
-        * @return Pointer to the created UI instance.
-        */
-        CEikAppUi* CreateAppUiL();
-    };
-
-/**
-*  Application UI instance of the notifier server application.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
- class CSyncMLNotifierAppServerAppUi: public CAknNotifierAppServerAppUi
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLNotifierAppServerAppUi();
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLNotifierAppServerAppUi();
- 
-        /**
-        * Symbian 2nd phase constructor.
-        */
-        void ConstructL();
-    };
-
-#endif      // SYNCMLNOTIFIERSERVERAPPLICATION_H
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/appserver/SyncMLNotifierappserver_reg.rss	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2005 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: Implementation of syncmlnotifier component
-* 	This is part of syncmlnotifier.
-*
-*/
-
-
-//  INCLUDES
-#include <appinfo.rh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x102072bf  //  UID
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "SyncMLNotifierAppServer";
-    hidden = KAppIsHidden;
-    }
Binary file syncmlfw/syncmlnotifier/cenrep/keys_syncmlnotifier.xls has changed
Binary file syncmlfw/syncmlnotifier/conf/syncmlnotifier.confml has changed
Binary file syncmlfw/syncmlnotifier/conf/syncmlnotifier_101F8769.crml has changed
--- a/syncmlfw/syncmlnotifier/data/SyncMLNotifier.rss	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,743 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Resource file for SyncML notifier component.
-*
-*/
-
-
-
-//  RESOURCE IDENTIFIER
-NAME    SMLN
-
-//  INCLUDES
-#include <bldvariant.hrh>
-#include <eikon.rsg>
-#include <eikon.rh>
-
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.loc>
-
-#include "SyncMLNotifier.hrh"
-#include <syncmlnotifier.loc>
-#include <syncmlnotifierfota.loc>
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf=""; }
-
-
-//  CONSTANTS  
-
-//  MACROS  
-
-//  RESOURCE DEFINITIONS 
-
-// =============================================================================
-// POP-UP QUERY TEXTS
-//
-// -----------------------------------------------------------------------------
-//   
-// r_sml_init_ds_server_prompt
-// Text for the server initiated synchronisation session acception
-// pop-up query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_sml_init_ds_server_prompt    { buf = qtn_ds_query_accept_configuration; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_sml_init_dm_server_prompt
-// Text for the server initiated management session acception
-// pop-up query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_sml_init_dm_server_prompt    { buf = qtn_dm_query_accept_configuration; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_sml_init_dm_server_prompt   
-// Text for the server initiated management session acception for chinese variant
-// pop-up query.
-//
-// -----------------------------------------------------------------------------
-RESOURCE TBUF r_qtn_dm_query_accept_postsale    { buf = qtn_dm_query_accept_postsale ; }
-
-//
-// -----------------------------------------------------------------------------
-//   
-// r_fota_conf_query_connection_is_needed
-// Text for the server initiated management session acception
-// pop-up query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_conf_query_connection_is_needed    { buf = qtn_fota_conf_query_connection_is_needed; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_sml_server_msg_prompt
-// Text for the server initiated management session acception
-// pop-up query.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_sml_server_msg_prompt    { buf = qtn_sml_server_message_heading; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_notif_complete
-// Text indicating that the firmware update was successful.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_notif_complete    { buf = qtn_fota_notif_complete; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_notif_complete
-// Text indicating that the firmware update was not successful.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_msg_query_not_updated  { buf = qtn_fota_msg_query_not_updated; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_battery_low
-// Text indicating that there is not enough battery power to perform
-// firmware update.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_battery_low            { buf = qtn_fota_battery_low; }
-//
-//----------------------------------------------------------------------------
-// r_fota_battery_low
-// Text indicating that there is not enough battery power to perform
-// firmware update.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_usb_battery_low            { buf = qtn_fota_msg_query_update_usb_charger; }
-//
-// -----------------------------------------------------------------------------
-//   
-// r_fota_lost_connection
-// Text indicating that the connection was lost during management
-// or FOTA package download.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_lost_connection        { buf = qtn_fota_err_lost_connection; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_server_error
-// Text indicating that the server returned an internal error when
-// the phone tried to connect to it.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_server_error           { buf = qtn_fota_server_error; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_not_permitted
-// Text indicating that firmware updating is not permitted.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_not_permitted          { buf = qtn_fota_not_permitted; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_query_install_now
-// Text indicating that firmware updating is not permitted.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_query_install_now      { buf = qtn_fota_conf_query_install_now; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_update_1_warning
-// First confirmation query describing the effect of firmware update.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_update_1_warning         { buf = qtn_fota_msg_query_update_1_warning; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_update_2_warning
-// Second confirmation query describing the effect of firmware update.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_update_2_warning         { buf = qtn_fota_msg_query_update_2_warning; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_custom_warning
-// confirmation query describing the effect of firmware update(chinese variant).
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_qtn_fota_msg_query_update_custom_warning  {buf = qtn_fota_msg_query_update_custom_warning;}
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_reboot_note
-// Text indicating that firmware updating is not permitted.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_reboot_note            { buf = qtn_fota_restarting_for_update; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_update_reminder
-// Text informing the user that he may installe the update from
-// device manager application.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_update_reminder        { buf = qtn_fota_msg_query_update_reminder; }
-
-// -----------------------------------------------------------------------------
-//   
-// r_fota_title_phone_updates
-// Header text for firmware update specific queries.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_fota_title_phone_updates    { buf = qtn_fota_query_title_phone_updates; }
-//#ifdef RD_FOTA_FLEXIBLE_MEMORY_USAGE
-RESOURCE TBUF r_fota_large_no_flexible_memory    { buf = qtn_fota_note_not_enough_disk_space; }
-RESOURCE TBUF r_fota_omadl_no_flexible_memory    { buf = qtn_fota_querry_not_enough_disk_space; }
-//#endif
-//#ifdef RD_DM_TEXT_INPUT_ALERT
-RESOURCE TBUF r_default_alert_heading  { buf = qtn_sml_server_message_heading; }
-//#endif
-RESOURCE TBUF r_fota_user_cancel    			{ buf = qtn_fota_query_download_continue; }
-RESOURCE TBUF r_fota_download_postponed   { buf = qtn_fota_query_download_postponed; }
-RESOURCE TBUF r_fota_download_cancelled   { buf = qtn_fota_query_download_cancelled; }
-RESOURCE TBUF r_fota_connection_fail2   	{ buf = qtn_fota_query_download_conn_lost; }
-RESOURCE TBUF r_fota_download_general_resume   { buf = qtn_fota_query_download_error_continue; }
-RESOURCE TBUF r_fota_download_no_resume   { buf = qtn_fota_query_download_error_restart; }
-RESOURCE TBUF r_fota_download_resume   		{ buf = qtn_fota_query_download_resume; }
-
-// Header text for encryption related queries
-RESOURCE TBUF r_fota_update_dec_warning        { buf = qtn_fota_msg_query_update_dec_warning; }
-RESOURCE TBUF r_fota_update_enc                { buf = qtn_fota_msg_query_update_encrypt; }
-RESOURCE TBUF r_fota_update_enc_battery_low    { buf = qtn_fota_battery_encryption_low; }
-RESOURCE TBUF r_fota_device_memory_busy        { buf = qtn_fota_device_busy; }
-// =============================================================================
-// SOFTKEYS
-//
-// -----------------------------------------------------------------------------
-//   
-// r_sml_softkeys_accept_cancel
-// Query for the server initiated session acception.
-//
-// -----------------------------------------------------------------------------
-//        
-RESOURCE CBA r_sml_softkeys_accept_cancel__accept
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyOk;     txt = text_softkey_accept; },
-        CBA_BUTTON { id = EAknSoftkeyCancel; txt = text_softkey_cancel; },
-        CBA_BUTTON { id = EAknSoftkeyOk;     txt = text_softkey_accept; }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//softkeys for the query to install downloaded package
-//------------------------------------------------------------------------------
-
-RESOURCE CBA r_fota_install_query_softkeys_now_later__now
-    {
-    buttons =
-        {
-        CBA_BUTTON { id = EAknSoftkeyYes; txt = text_softkey_now;   },
-        CBA_BUTTON { id = EAknSoftkeyNo;  txt = text_softkey_later; },
-        CBA_BUTTON { id = EAknSoftkeyYes; txt = text_softkey_now;   }
-        };
-    }
-
-// =============================================================================
-// QUERIES
-//
-// -----------------------------------------------------------------------------
-//   
-// r_sml_confirmation_query
-// Query for the server initiated session acception.
-//
-// -----------------------------------------------------------------------------
-//        
-RESOURCE DIALOG r_sml_confirmation_query
-    {
-    flags   = EGeneralQueryFlags;
-    	buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtQuery;
-            id      = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout    = EConfirmationQueryLayout;
-                animation = R_QGN_NOTE_QUERY_ANIM;
-                };
-            }
-        };
-    }
-// -----------------------------------------------------------------------------
-//   
-// r_sml_confirmation_query
-// Query for the downloaded package installation.
-//
-// -----------------------------------------------------------------------------
-
- 
- RESOURCE DIALOG r_fota_install_confirmation_query
-    {
-    flags   = EGeneralQueryFlags;
-    buttons = r_fota_install_query_softkeys_now_later__now;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtQuery;
-            id      = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout    = EConfirmationQueryLayout;
-                animation = R_QGN_NOTE_QUERY_ANIM;
-                };
-            }
-        };
-    }
-
-// -----------------------------------------------------------------------------
-//   
-// r_sml_server_msg_infonote
-// Info note for showing the information received from the server.
-//
-// -----------------------------------------------------------------------------
-//        
-RESOURCE DIALOG r_sml_server_msg_infonote
-    {
-    flags   = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtPopupHeadingPane;
-            id      = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label   = qtn_sml_server_message_heading;
-                };
-            },
-        DLG_LINE
-            {
-            type    = EAknCtMultilineQuery;
-            id      = EGeneralQuery;
-            control = AVKON_MESSAGE_QUERY
-                {
-                message    = "%U";
-                };
-            }
-        };
-    }
-
-
-// -----------------------------------------------------------------------------
-//   
-// r_sml_message_query
-// Query for showing the information received from the server.
-//
-// -----------------------------------------------------------------------------
-//        
-RESOURCE DIALOG r_sml_message_query
-    {
-    flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
-    items =
-        {
-        DLG_LINE 
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_sml_server_message_heading;
-                headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-                };
-            },
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                message = "%U";
-                };
-            }
-        };
-
-    }
-
-// -----------------------------------------------------------------------------
-//   
-// r_sml_fota_restart_note
-// Query for showing the information received from the server.
-//
-// -----------------------------------------------------------------------------
-//        
-RESOURCE DIALOG r_sml_fota_restart_note
-    {
-    flags   = EAknPermanentNoteFlags | EEikDialogFlagNoUserExit;
-    buttons = R_AVKON_SOFTKEYS_EMPTY;
-    items   =
-        {
-        DLG_LINE
-            {
-            type    = EAknCtNote;
-            id      = EGeneralQuery;
-            control = AVKON_NOTE
-                {
-                layout = EGeneralLayout;
-                animation = R_QGN_NOTE_INFO_ANIM;
-                };
-            }
-        };
-    }
-
-
-// -----------------------------------------------------------------------------
-// r_qtn_dm_info_note_updating  
-// Text indicating that server alert session is informative
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_qtn_dm_info_note_updating  { buf = qtn_dm_info_note_updating; }
-// r_sml_init_dm_server_prompt
-// Text for the server initiated management session acception for chinese variant
-// pop-up query.
-// -----------------------------------------------------------------------------
-RESOURCE TBUF r_qtn_dm_info_note_postsale    { buf = qtn_dm_info_note_postsale ; }
-
-//#ifdef RD_DM_TEXT_INPUT_ALERT
-// -----------------------------------------------------------------------------
-//   
-// r_inputtext_data_query
-// Data Query for Alphanumeric Text Input type
-//
-// -----------------------------------------------------------------------------
-//   
-RESOURCE DIALOG r_inputtext_data_query
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    items=
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_DATA_QUERY 
-                { 
-                layout = EDataLayout;
-                control =  EDWIN 
-               		{
-                		
-                		flags = EEikEdwinNoHorizScrolling;
-                		max_view_height_in_lines = 1;
-                		lines = 1;
-                		                		
-                	};
-                };
-            }
-        };
-    } 
-
-// -----------------------------------------------------------------------------
-//   
-// r_newalert_date_query
-// Data Query for Date Input type.
-//
-// -----------------------------------------------------------------------------
-//   
-RESOURCE DIALOG r_newalert_date_query
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    
-    items=
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_DATA_QUERY 
-                { 
-                layout = EDateLayout;
-                
-               	 	control =  DATE_EDITOR
-               		{
-                		minDate = DATE
-										{
-										year = 0001;
-											};
-										maxDate = DATE
-										{
-										year = 9999;
-										};
-										flags = 0;
-                		
-                		
-                	};
-                };
-            }
-        };
-    } 
-    
-// -----------------------------------------------------------------------------
-//   
-// r_newalert_time_query
-// Data Query for Date Input type.
-//
-// -----------------------------------------------------------------------------
-//   
-    RESOURCE DIALOG r_newalert_time_query
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    
-    items=
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_DATA_QUERY 
-                { 
-                layout = ETimeLayout;
-                
-               	 	control =  TIME_EDITOR
-               		{
-                		
-                		minTime = TIME
-						{
-						second = 0;
-						minute = 0;
-						hour = 0;
-						};
-						maxTime = TIME
-						{
-						second = 59;
-						minute = 59;
-						hour = 23;
-						};
-					flags = EEikTimeForce24HourFormat/*|EEikTimeWithoutSecondsField*/; //remove this flag to get seconds
-					
-                		
-                	};
-                };
-            }
-        };
-    } 
-    
-// -----------------------------------------------------------------------------
-//   
-// r_newalert_data_pwd_query
-// Data Query for Alphanumeric Password Input type.
-//
-// -----------------------------------------------------------------------------
-//      
-RESOURCE DIALOG r_newalert_data_pwd_query
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    
-    items=
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_DATA_QUERY 
-                { 
-                
-                layout = ECodeLayout;
-                 control = SECRETED
-               		{
-                		num_letters = 200;
-                		                		
-                	};
-                };
-            }
-        };
-    } 
-// -----------------------------------------------------------------------------
-//   
-// r_newalert_numeric_pwd_query
-// Data Query for Numeric Password Input type.
-//
-// -----------------------------------------------------------------------------
-//   
- RESOURCE DIALOG r_newalert_numeric_pwd_query
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    
-    items=
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_DATA_QUERY 
-                { 
-                
-                layout = EPinLayout;
-                 control = SECRETED
-               		{
-                		num_letters = 20;
-                		                		
-                	};
-                };
-            }
-        };
-    } 
- 
-// -----------------------------------------------------------------------------
-//   
-// r_newalert_phone_query
-// Data Query for Phone number Input type.
-//
-// -----------------------------------------------------------------------------
-//   
- RESOURCE DIALOG r_newalert_phone_query
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    
-    items=
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_DATA_QUERY 
-                { 
-                layout = EPhoneLayout;
-               	 control = EDWIN
-               		{
-                		
-                		flags = EEikEdwinNoHorizScrolling;
-                		lines = 1;
-                		maxlength = 200;
-                		allowed_input_modes =  EAknEditorNumericInputMode; 
-                		max_view_height_in_lines = 1;
-                		
-                	};
-                };
-            }
-        };
-    }    
-    
-// -----------------------------------------------------------------------------
-//   
-// r_newalert_number_query
-// Data Query for Number Text Input type.
-//
-// -----------------------------------------------------------------------------
-//       
-RESOURCE DIALOG r_newalert_number_query
-{
-	flags = EGeneralQueryFlags;
-	buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-	items =
-		{
-		DLG_LINE
-		{
-		type = EAknCtQuery;
-		id = EGeneralQuery;
-		control = AVKON_DATA_QUERY
-			{
-			layout = EFloatingPointLayout;
-			control = FLPTED
-				{
-				maxlength = 12;				
-				default = 0;
-				};
-			};
-		}
-		};
-}
-
-// -----------------------------------------------------------------------------
-//   
-// r_newalert_ip_query
-// Data Query for Ip Address Input type.
-//
-// -----------------------------------------------------------------------------
-//   
-RESOURCE DIALOG r_newalert_ip_query 
-{
-	flags = EGeneralQueryFlags; 
-	buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK; 
-		items = 
-		{
-		DLG_LINE 
-			{
-			type = EAknExtCtQuery; 
-			id = EGeneralQuery; 
-			control = AVKON_DATA_QUERY 
-				{
-				layout = EIpLayout; 
-				control = IP_FIELD_EDITOR 
-					{
-						min_field_values=IP_FIELD
-						{
-						first_field=0;
-						second_field=0;
-						third_field=0;
-						fourth_field=0;
-						};
-						max_field_values=IP_FIELD
-						{
-						first_field=255;
-						second_field=255;
-						third_field=255;
-						fourth_field=255;
-						}; 
-					}; 
-				} ;
-			}
-		};
-}
-
-//#endif
-// End of File
-
-
--- a/syncmlfw/syncmlnotifier/eabi/SyncMLNotifieru.def	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	_Z13NotifierArrayv @ 1 NONAME
-	_ZTI17CSyncmlmmcwatcher @ 2 NONAME
-	_ZTV17CSyncmlmmcwatcher @ 3 NONAME
--- a/syncmlfw/syncmlnotifier/ecom/101F876A.rss	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2005 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:  This file specifies the interface and implementation information
-*                 for SyncMLNotifier Ecom Plugins.
-*
-*/
-
-
-//  INCLUDES
-#include <registryinfo.rh>
-#include <uikon.hrh>
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <uiklaf/private/pluginuid.hrh>
-#endif
-
-
-//  RESOURCE DEFINITIONS 
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid = 0x101F876A;
-    interfaces =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid = KUikonUidPluginInterfaceNotifiers;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid = 0x101F876A;
-                    version_no = 1;
-                    display_name = "TTNOTIFY2V2 Plugin 1";
-                    default_data = "TTNOTIFY2V2";
-                    opaque_data	 = "0";
-                    }
-                };
-            }
-        };
-    }
--- a/syncmlfw/syncmlnotifier/ecom/SyncMLNotifierWrapper.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Methods for SyncML notifier Ecom Plugins entry point
-*
-*/
-
-
-// INCLUDE FILES
-#include <implementationproxy.h>
-#include <AknNotifierWrapper.h> // link against aknnotifierwrapper.lib
-
-#include "SyncMLNotifierBase.h"
-#include "SyncMLNotifDebug.h"
-
-
-// CONSTANTS
-const TInt KMaxSynchReplyBufLength = 256;
-
-const TInt KSmlNAppLaunchPriority = MEikSrvNotifierBase2::ENotifierPriorityVHigh;
-const TInt KSmlNDlgPriority       = MEikSrvNotifierBase2::ENotifierPriorityHigh;
-const TInt KSmlNFwUpdPriority     = MEikSrvNotifierBase2::ENotifierPriorityHigh;
-
-#ifdef __SERIES60_30__
-    const TUid KSmlNAppServerUid = { 0x102072bf }; 
-#else // __SERIES60_30__
-    _LIT( KSmlSyncMLNotifierDll, "syncmlnotifier.dll" );
-#endif // __SERIES60_30__
-
-
-// Provides pointer to the notifier creation function.
-const TImplementationProxy ImplementationTable[] =
-	{
-#ifdef __EABI__
-	{{0x101F876A},(TFuncPtr)NotifierArray}
-#else
-	{{0x101F876A},NotifierArray}
-#endif
-	};
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupArray
-// Deletes notifiers
-// -----------------------------------------------------------------------------
-void CleanupArray( TAny* aArray )
-    {
-    FLOG(_L("[SmlNotif]\t CleanupArray()"));
-    
-    CArrayPtrFlat<MEikSrvNotifierBase2>*     
-        subjects = static_cast<CArrayPtrFlat<MEikSrvNotifierBase2>*>(aArray);
-    TInt lastInd = subjects->Count() - 1;
-    for ( TInt i = lastInd; i >= 0; i-- )
-        {
-        subjects->At(i)->Release();	    	    
-        }
-    delete subjects;
-    
-    FLOG(_L("[SmlNotif]\t CleanupArray() completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// DoCreateNotifierArrayL
-// -----------------------------------------------------------------------------
-CArrayPtr<MEikSrvNotifierBase2>* DoCreateNotifierArrayL()
-    {
-    FLOG(_L("[SmlNotif]\t DoCreateNotifierArrayL()"));
-    CArrayPtrFlat<MEikSrvNotifierBase2>* subjects =
-        new ( ELeave ) CArrayPtrFlat<MEikSrvNotifierBase2>( KSmlNotifierArrayIncrement );
-    
-    CleanupStack::PushL( TCleanupItem( CleanupArray, subjects ) );
-
-    // Create Wrappers
-
-    // Session owning notifier
-#ifdef __SERIES60_30__
-
-
-    CAknNotifierWrapper* master = 
-        CAknNotifierWrapper::NewL( KSyncMLAppLaunchNotifierUid,
-                                   KSmlAppLaunchChannel,
-                                   KSmlNAppLaunchPriority,
-                                   KSmlNAppServerUid,
-                                   KMaxSynchReplyBufLength);
-
-#else // __SERIES60_30__
-
-    CAknCommonNotifierWrapper* master = 
-        CAknCommonNotifierWrapper::NewL( KSyncMLAppLaunchNotifierUid,
-                                         KSmlAppLaunchChannel,
-                                         KSmlNAppLaunchPriority,
-                                         KSmlSyncMLNotifierDll(),
-                                         KMaxSynchReplyBufLength);
-
-#endif // __SERIES60_30__
-		
-    subjects->AppendL( master );
-    
-   // Notifiers using masters session 
-    subjects->AppendL(new (ELeave) CAknNotifierWrapperLight(*master, 
-                                                            KSyncMLDlgNotifierUid,
-                                   			 				KSmlDlgChannel,
-                                   			 				KSmlNDlgPriority));
-                                   			 				
-   // Notifiers using masters session 
-    subjects->AppendL(new (ELeave) CAknNotifierWrapperLight(*master, 
-                                                            KSyncMLFwUpdNotifierUid,
-                                   			 				KSmlFwUpdChannel,
-                                   			 				KSmlNFwUpdPriority));
-                                   			 				
-    CleanupStack::Pop();	// array cleanup
-    FLOG(_L("[SmlNotif]\t DoCreateNotifierArrayL() completed"));
-    return( subjects );
-    }
-
-
-// -----------------------------------------------------------------------------
-// NotifierArray
-// Lib main entry point: Creates a notifiers array.
-// -----------------------------------------------------------------------------
-EXPORT_C CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
-    {
-    FLOG(_L("[SmlNotif]\t NotifierArray()"));
-    CArrayPtr<MEikSrvNotifierBase2>* array = 0;
-    TRAPD( ignore, array = DoCreateNotifierArrayL() );
-    if (ignore != KErrNone) 
-    	{
-    	ignore = KErrNone;
-    	}
-    FLOG(_L("[SmlNotif]\t NotifierArray() completed"));
-    return array;
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// ImplementationGroupProxy
-// DLL entry point
-// -----------------------------------------------------------------------------
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-	{
-	FLOG(_L("[SmlNotif]\t ImplementationGroupProxy()"));
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-	FTRACE( FPrint(
-	    _L("[SmlNotif]\t ImplementationGroupProxy completed, Table count = %d"),
-	    aTableCount ) );
-	return ImplementationTable;
-	}
-
--- a/syncmlfw/syncmlnotifier/ecom/SyncMLNotifierWrapper.mmp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2005 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:  This is project specification file for the SyncMLNotifier
-*                 Ecom Plugins.
-*
-*/
-
-#include  <platform_paths.hrh>
-
-TARGET          syncmlnotifierwrapper.dll
-CAPABILITY      CAP_ECOM_PLUGIN
-TARGETTYPE      PLUGIN 
-
-VENDORID        VID_DEFAULT
-
-UID             0x10009D8D 0x101F876A
-
-SOURCEPATH      .
-USERINCLUDE     .
-USERINCLUDE     ../inc
-
-// Default system include paths for app layer modules.
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom
-
-
-SOURCE          SyncMLNotifierWrapper.cpp 
-
-START RESOURCE  101F876A.rss 
-    TARGET syncmlnotifierwrapper.rsc
-    LANGUAGE_IDS
-END
-
-LIBRARY         ecom.lib
-LIBRARY         aknnotifierwrapper.lib
-LIBRARY         euser.lib
-
-DEBUGLIBRARY    flogger.lib
-SMPSAFE
Binary file syncmlfw/syncmlnotifier/group/101F8769.txt has changed
--- a/syncmlfw/syncmlnotifier/group/SyncMLNotifier.mmp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Notifier framework for SyncML DS and DM engine
-*
-*/
-
-#include <data_caging_paths.hrh>
-#include  <platform_paths.hrh>
-
-TARGET          syncmlnotifier.dll
-TARGETTYPE      DLL
-UID             0x101fdfae 0x101F8769
-
-TARGETPATH      /system/libs
-
-VENDORID        VID_DEFAULT
-CAPABILITY		CAP_GENERAL_DLL
-
-SOURCEPATH      ../src
-SOURCE          SyncMLNotifierMain.cpp
-SOURCE          SyncMLNotifierBase.cpp
-SOURCE          SyncMLAppLaunchNotifier.cpp
-SOURCE          SyncMLDlgNotifier.cpp
-SOURCE          SyncMLFwUpdNotifier.cpp
-SOURCE          SyncMLTimedMessageQuery.cpp
-SOURCE          SyncMLTimedQueryDialog.cpp
-SOURCE          SyncMLQueryTimer.cpp
-SOURCE          SyncMLQueryDialog.cpp
-SOURCE			SyncMLMessageQueryDialog.cpp
-SOURCE          SyncMLTimedDateQuery.cpp
-SOURCE          SyncMLTimedInputTextQuery.cpp
-SOURCE          SyncMLTimedNumberQueryDialog.cpp SyncMLAknPopUpList.cpp syncmlmmcwatcher.cpp
-
-START RESOURCE ../data/SyncMLNotifier.rss
-    HEADER
-    TARGETPATH  RESOURCE_FILES_DIR
-    LANGUAGE_IDS
-END 
-
-USERINCLUDE     ../inc
-
-// Default system include paths for app layer modules.
-APP_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib cone.lib                  // Symbian OS framework libraries
-LIBRARY avkon.lib                           // UI library
-LIBRARY bafl.lib                            // Basic Application Framework Library
-LIBRARY commonengine.lib                    // Series 60 common components library
-LIBRARY charconv.lib                        // Character conversion library
-LIBRARY eikcoctl.lib eiksrv.lib             // Eikon libraries
-LIBRARY eikdlg.lib                          // Eikon libraries
-LIBRARY eikcore.lib                         // Library for eikonEnv static functions (BringForwards)
-LIBRARY eiksrvui.lib                        // Eikon server ui (for suppressing app -key)
-LIBRARY esock.lib                           // Sockects library for host resolver
-LIBRARY aknskins.lib                        // Skinned icons
-LIBRARY syncservice.lib
-LIBRARY syncmlclientapi.lib
-LIBRARY aknnotifierwrapper.lib
-LIBRARY centralrepository.lib               // Central Repository
-LIBRARY connmon.lib
-LIBRARY ecom.lib estor.lib  eikctl.lib egul.lib aknicon.lib aknskinsrv.lib efsrv.lib
-LIBRARY disknotifyhandler.lib 
-
-//#ifdef RD_DM_TEXT_INPUT_ALERT
-LIBRARY insock.lib  //For IP address dialog
-//#endif
-DEBUGLIBRARY flogger.lib                    // File logging services
-
-
-SMPSAFE
-// End of File
-
--- a/syncmlfw/syncmlnotifier/group/bld.inf	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2005 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:  This file provides building information for SyncMLNotifier.
-*
-*/
-
-
-#include <platform_paths.hrh>
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-// Generic configuration interface for component cenrep settings 
-../conf/syncmlnotifier.confml                       MW_LAYER_CONFML(syncmlnotifier.confml)
-../conf/syncmlnotifier_101F8769.crml 	        	MW_LAYER_CRML(syncmlnotifier_101F8769.crml)
-
-../rom/SyncMLNotifier.iby							CORE_MW_LAYER_IBY_EXPORT_PATH(SyncMLNotifier.iby)
-../rom/SyncMLNotifierResources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(SyncMLNotifierResources.iby)
-../loc/SyncMLNotifier.loc							MW_LAYER_LOC_EXPORT_PATH(syncmlnotifier.loc)
-../loc/SyncMLNotifierFota.loc					MW_LAYER_LOC_EXPORT_PATH(syncmlnotifierfota.loc)
-
-PRJ_MMPFILES
-../group/SyncMLNotifier.mmp
-
-#ifdef __SERIES60_30__
-../appserver/SyncMLNotifierAppserver.mmp
-#endif // __SERIES60_30__
-
-../ecom/SyncMLNotifierWrapper.mmp
-
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
-
-//  End of File  
\ No newline at end of file
--- a/syncmlfw/syncmlnotifier/inc/SyncMLAknPopUplist.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +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:  Synchronisation server alert notifier.
-*
-*/
-
-#ifndef CSYNCMLAKNPOPUPLIST_H
-#define CSYNCMLAKNPOPUPLIST_H
-
-//  INCLUDES
-#include <aknPopup.h>   // CAknPopupList
-#include <aknlists.h>
-#include <SyncMLNotifierParams.h>
-#include "SyncMLQueryTimer.h"
-#include "syncmlmmcwatcher.h"
-#include "SyncMLNotifDebug.h"
-// CONSTANTS
-const TInt  KSyncMLNNoListTimeout  = 0; // The query does not time out
-
-// CLASS DECLARATION
-
-/**
-*  List query with timeout.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 5.2
-*/
-NONSHARABLE_CLASS ( CSyncMLAknPopUpList ) : public CAknPopupList,
-                                                 public MSyncMLQueryTimerObserver,
-                                                 public MSyncMLQueryMmcObserver
-    {
-    public:  
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLAknPopUpList* NewL(CAknSingleHeadingPopupMenuStyleListBox* listBox,
-                TInt aResId,AknPopupLayouts::TAknPopupLayouts aPopuplayout,
-                TInt   aTimeout = KSyncMLNNoListTimeout);		           
-        
-        /**
-         * Constructor.
-         */
-        CSyncMLAknPopUpList(TInt aTimeout = KSyncMLNNoListTimeout);
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLAknPopUpList();
-        
-        /**
-         * From CEikDialog.
-         *
-         * Loads, displays, and destroys the dialog.
-         */
-        TBool ExecuteLD();
-
-    public: // Functions from base classes
-
-        /**
-        * From MSyncMLQueryTimerObserver Is called when the timer
-        * runs out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void TimerExpired();
-        
-        /**
-         * From MSyncMLQueryMmcObserver is called when mmc removed
-         * @since Series 60 5.2
-         * @param None
-         * @return None 
-         */
-        void MmcRemoved();
-        
-        /**
-         * returns the status of mmc removal
-         * @since Series 60 5.2
-         * @param None
-         * @return ETrue/EFalse
-         */
-		TBool IsMmcRemoved();
-        
-    protected:                               
-        /**
-         * Constructs a pop up list box 
-         * @since Series 60 5.2
-         * @param aListBox, reference to CAknSingleHeadingPopupMenuStyleListBox
-         * @param aCbaResource, resource id of CBA
-         * @param aType, popup layout of the list
-         * @return None
-         */
-        void ConstructL(CAknSingleHeadingPopupMenuStyleListBox* aListBox, 
-                                     TInt aCbaResource,
-                                     AknPopupLayouts::TAknPopupLayouts aType );
-        
-    private:    
-        // Number of seconds before the query is timed out. 0 = no timeout.
-        TInt               iTimeout;
-        
-        //Current state of MMC removal
-        TBool immcremoved;
-        
-        // Pointer to the timer instance
-        CSyncMLQueryTimer*  iTimer;
-        
-        //Pointer to MMC watcher
-        CSyncmlmmcwatcher*  iMmcwatcher;       
-    };
-
-#endif      // CSYNCMLTIMEDMESSAGEQUERY_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Server alerts for Data Sync and Device Management engines. 
-*                
-*
-*/
-
-
-
-#ifndef CSYNCMLAPPLAUNCHNOTIFIER_H
-#define CSYNCMLAPPLAUNCHNOTIFIER_H
-
-//  INCLUDES
-#include <SyncMLClient.h>
-
-#include <SyncMLNotifierParams.h>
-#include "SyncMLNotifierBase.h"    // Base class
-#include <SyncService.h>
-#include <centralrepository.h>
-
-// CONSTANTS
-// From S60\SyncMLFota
-const TUid KUidNSmlMediumTypeInternet = { 0x101F99F0 };
-_LIT8( KNSmlIAPId, "NSmlIapId" );
-_LIT8( KNSmlAlwaysAsk, "-1" );
-const TInt  KDefaultTimeoutforNotes ( 30 );
-
-const TUid KCRUidNSmlDSApp       = { 0x101F9A1D };
-// CLASS DECLARATION
-/**
-*  Notifier for launching SyncML applications
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-NONSHARABLE_CLASS( CSyncMLAppLaunchNotifier ) : public CSyncMLNotifierBase
-    {
-    public:  // Constructors and destructor
-        enum TSanSupport
-        {
-        	EOff,EON
-        };
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLAppLaunchNotifier* NewL();
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLAppLaunchNotifier();
-        
-    public:
-        /**
-        * Returns correct SyncService depending on the Service Id
-        * @param aServiceId
-        * @return CSyncService* 
-        */
-        CSyncService* SyncServiceL( TUint aServiceId );
-
-    private: // New functions
-
-        /**
-        * Retrieves required parameters for the note and launching of the
-        * synchronization application.
-        * @param aParam Parameter structure that is forwarded to syncservice
-        * @param aServerName Returns the clear-text name of the corresponding server.
-        * @param aUserInteraction Returns the profile setting of whether the user
-        *                         acceptance should be queried.
-        * @return None
-        */
-        void RetrieveSyncParamsL( TSyncServiceParam& aParam,
-                                  TDes& aServerName,
-                                  TSmlServerAlertedAction& aUserInteraction );
-
-        /**
-        * Retrieves required parameters for the note and launching of the
-        * device management application.
-        * @param aParam Parameter structure that is forwarded to syncservice
-        * @param aServerName Returns the clear-text name of the corresponding server.
-        * @param aUserInteraction Returns the profile setting of whether the user
-        *                         acceptance should be queried.
-        * @return None
-        */
-        void RetrieveMgmtParamsL( TSyncServiceParam& aParam,
-                                  TDes& aServerName,
-                                  TSmlServerAlertedAction& aUserInteraction );
-
-        /**
-        * Checks if the user and/or parameters have defined that the session
-        * should be accepted without querying the user.
-        * @param aUserInteraction Sync profile interaction enumeration.
-        * @return True, if the session is accepted automatically.
-        */
-        TBool IsSilent( TSmlServerAlertedAction& aUserInteraction );
-
-    private: // Functions from base classes
-
-        /**
-        * From CSyncMLNotifierBase Called when a notifier is first loaded.        
-        * @param None.
-        * @return A structure containing priority and channel info.
-        */
-        TNotifierInfo RegisterL();
-
-        /**
-        * From CSyncMLNotifierBase The notifier has been deactivated 
-        * so resources can be freed and outstanding messages completed.
-        * @param None.
-        * @return None.
-        */
-        void Cancel();
-
-        /**
-        * From CSyncMLNotifierBase Used in asynchronous notifier launch to 
-        * store received parameters into members variables and 
-        * make needed initializations.
-        * @param aBuffer A buffer containing received parameters
-        * @param aReturnVal The return value to be passed back.
-        * @param aMessage Should be completed when the notifier is deactivated.
-        * @return None.
-        */
-        void GetParamsL( const TDesC8& aBuffer,
-                               TInt aReplySlot,
-                         const RMessagePtr2& aMessage );
-
-        /**
-        * From CSyncMLNotifierBase Gets called when a request completes.
-        * @param None.
-        * @return None.
-        */
-        void RunL();
-        
-        /**
-        * From RConnectionMonitor gets the staus of roaming .
-        * If roaming returns true else returns false
-        * @param ret
-        * @return None.
-        */
-        void IsRoamingL(TBool& ret);
-        /**
-        * HandleDMSession
-        * @param ret
-        * @return TBool 
-        */
-				TBool HandleDMSessionL();
-				/**
-        * HandleCompleteMessage
-        * @param TInt &keypress, TBool &silent, TInt &SanSupport, TInt &Timeout, TInt &CustomNotes
-        * @return None.
-        */
-				void HandleCompleteMessageL(TInt &keypress, TBool &silent, TInt &SanSupport, TInt &Timeout, TInt &CustomNotes);
-				/**
-        * IsLanguageSupported
-        * @param ret
-        * @return True if the language is supported.
-        */
-				TBool IsLanguageSupportedL();
-        
-        void ReadRepositoryL(TInt aKey, TInt& aValue);
-        
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLAppLaunchNotifier();
-
-    private: // Data
-        // Type of session queried
-        TSyncMLSessionTypes iSmlProtocol;
-        
-        // Job identifier from the parameters
-        TInt                iJobId;
-        
-        // Identifier of the used SyncML profile from the parameters
-        TInt                iProfileId;
-        
-        // Sync Service for Data Sync
-        CSyncService*       iDSSyncService;
-        // Sync Service for Device Management
-        CSyncService*       iDMSyncService;
-        // Is always ask selected as accesspoint for current profile
-        TBool               iAlwaysAsk;
-       // Alert mode
-        TInt iUimode;        
-        // DM Sync Server        
-        TBuf<KSyncMLMaxProfileNameLength> DMSyncServerName;
-        // UI behaviour 
-    		TSmlServerAlertedAction uiAction;
-    		// Sync Service param 
-   			TSyncServiceParam param;
-   			// Stringholder
-    		HBufC* stringholder;  
-    		// Central Respository   
-    		CRepository* centrep; 
-        // To store the bearer type
-        TInt iBearerType;
-    };
-
-
-#endif      // CSYNCMLAPPLAUNCHNOTIFIER_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLDlgNotifier.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Synchronisation server alert notifier.
-*
-*/
-
-
-
-#ifndef CSYNCMLDLGNOTIFIER_H
-#define CSYNCMLDLGNOTIFIER_H
-
-//  INCLUDES
-#include <SyncMLNotifierParams.h>
-#include "SyncMLNotifierBase.h"    // Base class
-#include <aknselectionlist.h> 
-#include <aknlists.h>
-#include <AknIconArray.h> 
-// FORWARD DECLARATIONS
-class CSyncMLAppLaunchNotifier;
-
-// CLASS DECLARATION
-
-/**
-*  Notifier for information received from synchronisation server.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-NONSHARABLE_CLASS( CSyncMLDlgNotifier ) : public CSyncMLNotifierBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLDlgNotifier* NewL(
-            CSyncMLAppLaunchNotifier* aAppLaunchNotif );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLDlgNotifier();
-
-    protected:  // New functions
-        
-        /**
-        * Tries to enable or disable the sync progress notes.
-        * @since Series 60 3.0
-        * @param aEnable Should the progress notes be enabled.
-        * @return None
-        */
-        void EnableSyncProgressNoteL( TBool aEnable );
-
-    private: // Functions from base classes
-
-        /**
-        * From CSyncMLNotifierBase Called when a notifier is first loaded.        
-        * @param None.
-        * @return A structure containing priority and channel info.
-        */
-        TNotifierInfo   RegisterL();
-
-        /**
-        * From CSyncMLNotifierBase Used in asynchronous notifier launch to 
-        * store received parameters into members variables and 
-        * make needed initializations.
-        * @param aBuffer A buffer containing received parameters
-        * @param aReturnVal The return value to be passed back.
-        * @param aMessage Should be completed when the notifier is deactivated.
-        * @return None.
-        */
-        void GetParamsL( const TDesC8&       aBuffer,
-                               TInt          aReplySlot,
-                         const RMessagePtr2& aMessage );
-
-        /**
-        * From CSyncMLNotifierBase The notifier has been deactivated 
-        * so resources can be freed and outstanding messages completed.
-        * @param None.
-        * @return None.
-        */
-        void Cancel();
-
-        /**
-        * From CSyncMLNotifierBase Gets called when a request completes.
-        * @param None.
-        * @return None.
-        */
-        void RunL();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLDlgNotifier( CSyncMLAppLaunchNotifier* aAppLaunchNotif );
-        /**
-        * Action for the Alphanumeric input.
-        * @param result.
-        * @return None.
-        */
-				void InputTypeAlphaNumericL(TInt & result);
-				/**
-        * Action for the Numeric input.
-        * @param result.
-        * @return None.
-        */
-				void InputTypeNumericL(TInt & result);
-				/**
-        * Action for the Date input.
-        * @param result.
-        * @return None.
-        */
-				void InputTypeDateL(TInt & result);
-				/**
-        * Action for the Time input.
-        * @param result.
-        * @return None.
-        */
-				void InputTypeTimeL(TInt & result);
-				/**
-        * Action for the Phone number input.
-        * @param result.
-        * @return None.
-        */
-				void InputTypePhoneNumberL(TInt & result);
-				
-        /**
-         * Set icons on markable list
-         * @param aListBox, pointer to listbox.
-         * @return None.
-         */
-        void SetIconsL(CEikFormattedCellListBox* aListBox);
-		
-    private: // Data
-        // The type of the note requested.
-        TSyncMLDlgNoteTypes             iNoteType;
-        
-        // Server message from the parameters
-        TBuf<KSyncMLMaxServerMsgLength> iServerMsg;
-        
-        // Maximum time the query is shown. (In seconds)
-        TInt                            iMaxTime;
-        //Maximum length of the server message
-        TInt iMaxlen;
-		//Default response of the alert
-        TBuf<KSyncMLMaxDefaultResponseMsgLength> iDR;
-        //Input type of user input alert
-        TInt iIT;
-		//Echo type of user input alert
-        TInt iET;
-        //Number of choice items in user choice alerts
-        TInt iNumberOfItems;
-        // Pointer to the application launcher notifier instance.
-        CSyncMLAppLaunchNotifier*       iAppLaunchNotif;
-		//array of user choice alert items
-        CDesCArrayFlat* iListItems;
-		//Default selection item in user choice alerts
-        TInt iDefindex;
-		//reply buffer
-        TSyncMLDlgNotifReturnParams reply;
-		//Member variable to identify end key press
-        TBool EndKeyPress;
-		//Chunk to retrieve the user choice alert items
-        RChunk iChunk;
-    };
-
-
-#endif      // CSYNCMLDLGNOTIFIER_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLFwUpdNotifier.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Synchronisation server alert and application launcher notifier.
-*
-*/
-
-
-
-#ifndef CSYNCMLFWUPDNOTIFIER_H
-#define CSYNCMLFWUPDNOTIFIER_H
-
-//  INCLUDES
-#include <SyncMLNotifierParams.h>
-#include "SyncMLNotifierBase.h"    // Base class
-#include "SyncMLMessageQueryDialog.h"
-#include <SyncService.h>
-
-// CONSTANTS
-// Taken from S60\OmaDSAppUi\inc\NSmlDMSyncPrivateCRKeys.h
-const TUid KCRUidNSmlDMSyncApp = {0x101f6de5};
-const TUint32 KNSmlDMFotaConfigurationKey = 0x00000001;
-const TUint KNSmlDMFotaEnableFotaViewFlag = 0x0004;
-
-//Constants required to indicate key presses in dialogs
-enum 
-	{
-    ESyncMLDlgRespKeyNone = -3,
-    ESyncMLDlgRespKeyOk = -2,
-    ESyncMLDlgRespKeyOthers = -1,
-    ESyncMLDlgRespKeyCancel = 0
-    };
-
-
-//Constants used when update happen NSC/DM 
-enum {
-		EFotaUpdateNSC=1,
-		EFotaUpdateNSCBg,
-		EFotaUpdateDM
-};
-
-// CLASS DECLARATION
-/**
-*  Notifier for showing the rsult of the firmware
-*  update to the user.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.1
-*/
-NONSHARABLE_CLASS( CSyncMLFwUpdNotifier ) : public CSyncMLNotifierBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLFwUpdNotifier* NewL();
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLFwUpdNotifier();
-
-    private: // New functions
-
-        /**
-        * Shows a note describing the error situation that has been encountered
-        * when checking the prerequisites for firmware update.
-        * @param None
-        * @return Result to the query
-        */
-        TInt ShowUpdateErrorNoteL();
-
-        /**
-        * Shows a note describing the result of firmware update.
-        * @param None
-        * @return Result to the query
-        */
-        TInt ShowUpdateResultNoteL();
-
-        /**
-        * Informs the user about the firmware update and its consequences.
-        * Queries if the user wants to continue with the update.
-        * @param None
-        * @return Result to the query
-        */
-        TInt ShowUpdateStartQueryL();
-		
-        /**
-        * Informs the user about the firmware update while encrypted phone memory.
-        * Queries if the user wants to continue with the update.
-        * @param None
-        * @return Result to the query
-        */
-        TInt ShowUpdateStartQueryEncryptionL();
-        
-        /**
-        * Shows a note describing the result of firmware update. Also queries
-        * user to encrypt memory 
-        * @param None
-        * @return Result to the query
-        */
-        TInt ShowUpdateResultWithEncryptionNoteL();
-
-        /**
-        * Retrieves the profile name using the profile identifier stored
-        * in iNoteInfo.
-        * @param aServerName Returns the clear-text name of the corresponding server.
-        * @return None
-        */
-        void RetrieveProfileNameL( TDes& aServerName );
-        /*Information note shown  to the user after selecting No reminder case in
-	    * the reminder dialog. This note informs the user that downloaded package 
- 	    * can be installed manually. 
- 	    */
-
-        TInt ShowNoReminderQueryL();
-        
-        /*Message query note shown  to the user when ever there is no enough memory
-        * space to download the update package
- 	    */
-        TInt ShowNotEnoughMemoryL( TInt &aMemoryNeeded ,TBool aOmaDL );
-
-				/*Message query note shown to the user when ever the user cancels the download
-				 * and whether the user wants to resume the download at a later point of time. 
-				 * @param None
-         * @return Result to the query
- 	       */
-				TInt ShowDownloadUserCancelL();
-		
-				/*Message note shown to the user when ever 
-				 * the user postponds the download 
-		     * @param None
-         * @return Result to the query
- 	       */
-				TInt ShowDownloadPostponedL();
-		
-				/*Message note shown to the user when ever 
-				 * the user cancels the download 
-		     * @param None
-         * @return Result to the query
- 	       */
-				TInt ShowDownloadCancelledL();
-		
-				/*Message note shown to the user when ever 
-				 * the user wants to resume the download.
-		     * @param None
-         * @return Result to the query
- 	       */
-				TInt ShowDownloadResumeL();
-    private: // Functions from base classes
-
-        /**
-        * From CSyncMLNotifierBase Called when a notifier is first loaded.        
-        * @param None.
-        * @return A structure containing priority and channel info.
-        */
-        TNotifierInfo RegisterL();
-
-        /**
-        * From CSyncMLNotifierBase The notifier has been deactivated 
-        * so resources can be freed and outstanding messages completed.
-        * @param None.
-        * @return None.
-        */
-        void Cancel();
-
-        /**
-        * From CSyncMLNotifierBase Gets called when a request completes.
-        * @param None.
-        * @return None.
-        */
-        void RunL();
-
-        /**
-        * From CSyncMLNotifierBase Used in asynchronous notifier launch to 
-        * store received parameters into members variables and 
-        * make needed initializations.
-        * @param aBuffer A buffer containing received parameters
-        * @param aReturnVal The return value to be passed back.
-        * @param aMessage Should be completed when the notifier is deactivated.
-        * @return None.
-        */
-        void GetParamsL( const TDesC8&       aBuffer,
-                               TInt          aReplySlot,
-                         const RMessagePtr2& aMessage );
-        /**
-        * IsLanguageSupported
-        * @param ret
-        * @return True if the language is supported.
-        */                 
-				TBool IsLanguageSupportedL();
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLFwUpdNotifier();
-
-    private: // Data
-        // Type of note to be shown
-        TSyncMLFwUpdNoteTypes   iNoteType;
-        
-        // Possible additional information required by the note
-        TInt                    iNoteInfo;
-        
-        //Memory needed for the for the fota update package to be downloaded
-//        #ifdef RD_FOTA_FLEXIBLE_MEMORY_USAGE
-        TInt        iFotaMemoryNeeded;
-//        #endif
-        //Checks whether dialog from RUNL popped and waiting for user input
-        TBool iRunLhang;
-        
-        //Reference to the Dialog launched from RunL
-        CSyncMLMessageQueryDialog* iDlg;
-        
-		//To decide on encryption note or default note.
-        TBool iFotaEncryptReq;
-
-    };
-
-
-#endif      // CSYNCMLFWUPDNOTIFIER_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLMessageQueryDialog.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Message Query Dialog
-*
-*/
-
-
-
-#ifndef CSYNCMLMESSAGEQUERYDIALOG_H
-#define CSYNCMLMESSAGEQUERYDIALOG_H
-
-//  INCLUDES
-#include <aknmessagequerydialog.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Message query with timeout.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-NONSHARABLE_CLASS ( CSyncMLMessageQueryDialog ) : public CAknMessageQueryDialog
-                                                 
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLMessageQueryDialog* NewL(TBool& aKeyPress);        
-                  
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLMessageQueryDialog();
-
-    public: // Functions from base classes
-		/**
-        * Calls the exit of the Dialog launched
-        * @param None.
-        * @return None.
-        */
-        void ExitL();
-        
-    protected:  // Functions from base classes
-        
-
-        /**
-        * From CEikDialog: Determines if the dialog can be closed.
-        * @param aButtonId Identifier of the button pressed.
-        * @return whether to close the dialog or not.
-        */
-        TBool OkToExitL( TInt aButtonId );
-
-        /**
-        * Called by OfferkeyEventL(), gives a change to dismiss the query even with
-        * keys different than Enter of Ok.
-        * @param aKeyEvent has the key event details
-        * @return whether to dismiss the dialog or not.
-        */
-        TBool NeedToDismissQueryL(const TKeyEvent& aKeyEvent);
-        
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLMessageQueryDialog(TBool& aKeyPress  );
-
-
-    private:    // Data
-        
-         TBool& iKeyPress;
-    };
-
-#endif      // CSYNCMLMESSAGEQUERYDIALOG_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLNotifDebug.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 2005 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:  This file defines logging macros for SyncML notifiers
-*
-*/
-
-
-#ifndef SMLNOTIFIER_DEBUG_H
-#define SMLNOTIFIER_DEBUG_H
-
-
-#ifdef _DEBUG
-
-#include <e32svr.h>
-#include <e32std.h>
-#include <f32file.h>
-#include <flogger.h>
-
-_LIT( KLogFile,"sml_notiflog.txt" );
-_LIT( KLogDirFullName,"c:\\logs\\SyncML\\" );
-_LIT( KLogDir,"SyncML" );
-
-// ===========================================================================
-#ifdef __WINS__     // File logging for WINS
-// ===========================================================================
-// Declare the FPrint function
-inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-    RFileLogger::WriteFormat( KLogDir,
-                              KLogFile,
-                              EFileLoggingModeAppend,
-                              aFmt,
-                              list );
-    }
-
-#define FLOG( a )   { FPrint( a ); }
-#define FTRACE( a ) { a; }
-
-// ===========================================================================
-#else               // RDebug logging for target HW
-// ===========================================================================
-
-// Declare the FPrint function
-inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START(list,aFmt);
-    TInt tmpInt = VA_ARG(list, TInt);
-    TInt tmpInt2 = VA_ARG(list, TInt);
-    TInt tmpInt3 = VA_ARG(list, TInt);
-    TInt tmpInt4 = VA_ARG(list, TInt);
-    TInt tmpInt5 = VA_ARG(list, TInt);
-    TInt tmpInt6 = VA_ARG(list, TInt);
-    TInt tmpInt7 = VA_ARG(list, TInt);
-    TInt tmpInt8 = VA_ARG(list, TInt);
-    VA_END(list);
-    RDebug::Print(aFmt, tmpInt, tmpInt2, tmpInt3, tmpInt4, tmpInt5, tmpInt6, tmpInt7, tmpInt8);
-    }
-
-#define FLOG( a ) { RDebug::Print(a);  }
-#define FTRACE( a ) { a; }
-#endif //__WINS__
-
-// ===========================================================================
-#else // // No loggings --> Reduced binary size
-// ===========================================================================
-#define FLOG( a )
-#define FTRACE( a )
-
-#endif // _DEBUG
-
-
-#endif // SMLNOTIFIER_DEBUG_H
-
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLNotifPrivateCRKeys.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* 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: 
-*     SyncML Notifier  private CenRep key definitions
-*
-*/
-
-
-#ifndef SYNCML_NOTIF_PRIVATE_CR_KEYS_H
-#define SYNCML_NOTIF_PRIVATE_CR_KEYS_H
-
-
-/**
-* SyncML Notifier Private Keys UID
-*/
-const TUid KCRUidNSmlNotifierPrivateKeys = {0x101F8769};
-
-
-// Device manager key UID
-const TUid KPSUidNSmlDMSyncApp = {0x101f6de5};
-
-
-
-//PubSub key used to mark which application is handling the process of download
-//Sets by DM UI, NSC or NSCBackground
-const TUint32 KNSmlCurrentFotaUpdateAppName = 0x0000000A;
-
-
-//PubSub key used to define should "Install Now?" query be shown or not
-//Sets by DM UI or NSC
-const TUint32 KDevManShowInstallNowQuery = 0x0000000B;
-
-
-/**
-* CenRep key for defining whether DM session blocked in roaming or not.
-* 
-*
-* Possible integer values:
-* 0 or 1
-* 0 means that feature is disabled
-* 1 means feature is enabled
-* Default value: 0 (not enabled)
-*
-* If 1 then if the phone is in roaming server alert message is not 
-* processed hence DM session doesnot get started
-*/
-//const TUint32 KNSmlDMBlockedInRoaming = 0x00000001;
-
-#endif // SYNCML_NOTIF_PRIVATE_CR_KEYS_H
-
--- a/syncmlfw/syncmlnotifier/inc/SyncMLNotifier.hrh	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005 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: Implementation of syncmlnotifier component
-* 	This is part of syncmlnotifier.
-*
-*/
-
-
-#ifndef SYNCMLNOTIFIER_HRH
-#define SYNCMLNOTIFIER_HRH
-
-// DATA TYPES
-#define avkon_bitmap_file "Z:\\system\\data\\avkon.mbm"
-
-#endif      // SYNCMLNOTIFIER_HRH
-
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLNotifierBase.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,217 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Declares SyncML notifiers base class.
-*
-*/
-
-
-
-#ifndef CSYNCMLNOTIFIERBASE_H
-#define CSYNCMLNOTIFIERBASE_H
-
-//  INCLUDES
-#include <SyncMLNotifier.h>
-
-// CONSTANTS
-// Channel for app starter notifier
-const TUid KSmlAppLaunchChannel = {0x101F8769};
-
-// Channel for server dialog notifier
-const TUid KSmlDlgChannel       = {0x101F876A};
-const TUid KSmlFwUpdChannel     = {0x102072BF}; // Channel for firmware update notifier
-
-// Number of notifiers
-const TInt KSmlNotifierArrayIncrement = 3;  // Number of notifiers
-
-// FORWARD DECLARATIONS
-class CEikonEnv;
-
-// CLASS DECLARATION
-
-/**
-* The base class for the SyncML notifiers.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-NONSHARABLE_CLASS( CSyncMLNotifierBase ) : public CActive,
-                                           public MEikSrvNotifierBase2
-    {
-    public:  // Constructors and destructor
-    
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLNotifierBase();
-
-
-    protected:  // New functions
-        
-        /**
-        * Used in asynchronous notifier launch to store received parameters 
-        * into members variables and make needed initializations.        
-        * @since Series 60 3.0
-        * @param aBuffer A buffer containing received parameters
-        * @param aReturnVal The return value to be passed back.
-        * @param aMessage Should be completed when the notifier is deactivated.
-        * @return None.
-        */
-        virtual void GetParamsL(const TDesC8& aBuffer, 
-                                      TInt aReplySlot, 
-                                const RMessagePtr2& aMessage) = 0;
-
-        /**
-        * A utility function for requesting the activation of lights.
-        * @since Series 60 3.0
-        * @param None.
-        * @return None.
-        */
-        void TurnLightsOn();
-
-        /**
-        * A utility function for checking whether autolock is on.
-        * @since Series 60 3.0
-        * @param None.
-        * @return A boolean according to autolock state.
-        */
-        TBool AutoLockOnL();
-
-		/**
-		* A function for checking the status of Apps key.
-        * @since Series 60 3.0
-		* @param aEnable A Boolean according to Apps key status
-		* @return None.
-		*/
-		void SuppressAppSwitching( TBool aEnable );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        virtual void ConstructL();
-
-    protected:  // Functions from base classes
-
-        /**
-        * From CActive Gets called when a request completes.
-        * @param None.
-        * @return None.
-        */
-        virtual void RunL() = 0;
-
-        /**
-        * From CActive Gets called when a leave occurres in RunL.
-        * @param aError Symbian OS errorcode.
-        * @return None.
-        */
-        virtual TInt RunError( TInt aError );
-
-        /**
-        * From MEikSrvNotifierBase2 Called when a notifier is first loaded 
-        * to allow any initial construction that is required.
-        * @param None.
-        * @return A structure containing priority and channel info.
-        */
-        virtual TNotifierInfo RegisterL() = 0;
-        
-        /**
-        * From MEikSrvNotifierBase2 The notifier has been deactivated 
-        * so resources can be freed and outstanding messages completed.
-        * @param None.
-        * @return None.
-        */
-        virtual void Cancel();
-
-    protected:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLNotifierBase();
-
-    private: // Functions from base classes        
-        
-        /**
-        * From MEikSrvNotifierBase2 Called when all resources allocated 
-        * by notifiers should be freed.
-        * @param None.
-        * @return None.
-        */
-        virtual void Release();
-
-        /**
-        * From MEikSrvNotifierBase2 Return the priority a notifier takes 
-        * and the channels it acts on.
-        * @param None.
-        * @return A structure containing priority and channel info.
-        */
-        virtual TNotifierInfo Info() const;
-
-        /**
-        * From MEikSrvNotifierBase2 Synchronic notifier launch.        
-        * @param aBuffer Received parameter data.
-        * @return A pointer to return value.
-        */
-        virtual TPtrC8 StartL( const TDesC8& aBuffer );
-        
-        /**
-        * From MEikSrvNotifierBase2 Asynchronic notifier launch.
-        * @param aBuffer A buffer containing received parameters
-        * @param aReturnVal The return value to be passed back.
-        * @param aMessage Should be completed when the notifier is deactivated.
-        * @return A pointer to return value.
-        */
-        virtual void StartL( const TDesC8& aBuffer,
-                                   TInt aReplySlot,
-                             const RMessagePtr2& aMessage );
-        
-        /**
-        * From MEikSrvNotifierBase2 Updates a currently active notifier.
-        * @param aBuffer The updated data.
-        * @return A pointer to return value.
-        */
-        virtual TPtrC8 UpdateL( const TDesC8& aBuffer );       
-
-        /**
-        * From CActive Gets called when a request is cancelled.
-        * @param None.
-        * @return None.
-        */
-        virtual void DoCancel();   
-		
-    protected:  // Data
-        // Received message
-        RMessagePtr2    iMessage;
-        
-        // Reply slot
-        TInt            iReplySlot;
-
-        // Flag for releasing messages
-        TBool           iNeedToCompleteMessage;
-        
-        // Notifier parameters structure
-        TNotifierInfo   iInfo;
-        
-        // Local eikonenv
-        CEikonEnv*      iEikEnv;
-
-        // Apps key status 
-        TBool           iAppsKeyBlocked;
-
-        // Flag for eikon env.
-        TInt            iResourceFileFlag;
-    };
-
-#endif      // CSYNCMLNOTIFIERBASE_H
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLQueryDialog.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Query dialog.
-*
-*/
-
-
-
-#ifndef CSYNCMLQUERYDIALOG_H
-#define CSYNCMLQUERYDIALOG_H
-
-//  INCLUDES
-#include <AknQueryDialog.h>
-
-
-
-// CLASS DECLARATION
-
-/**
-*  Message query with timeout.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-NONSHARABLE_CLASS ( CSyncMLQueryDialog ) : public CAknQueryDialog
-                                                 
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLQueryDialog* NewL(TBool& aKeyPress);        
-                  
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLQueryDialog();
-
-    public: // Functions from base classes
-
-        
-    protected:  // Functions from base classes
-        
-
-        /**
-        * From CEikDialog: Determines if the dialog can be closed.
-        * @param aButtonId Identifier of the button pressed.
-        * @return whether to close the dialog or not.
-        */
-        TBool OkToExitL( TInt aButtonId );
-
-        /**
-        * Called by OfferkeyEventL(), gives a change to dismiss the query even with
-        * keys different than Enter of Ok.
-        * @param aKeyEvent has the key event details
-        * @return whether to dismiss the dialog or not.
-        */
-        TBool NeedToDismissQueryL(const TKeyEvent& aKeyEvent);
-        
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLQueryDialog(TBool& aKeyPress  );
-
-
-    private:    // Data
-        
-         TBool& iKeyPress;
-    };
-
-#endif      // CSYNCMLQUERYDIALOG_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLQueryTimer.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Message query with timeout.
-*
-*/
-
-
-
-#ifndef CSYNCMLQUERYTIMER_H
-#define CSYNCMLQUERYTIMER_H
-
-//  INCLUDES
-#include <e32base.h>
-
-// CLASS DECLARATION
-
-/**
-*  Timer observer class for SyncML notifier queries.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-NONSHARABLE_CLASS ( MSyncMLQueryTimerObserver )
-    {
-    public: // New functions
-        /**
-        * Is called when the timer expires.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        virtual void TimerExpired() = 0;
-    };
-
-/**
-*  Timer class for SyncML notifier queries.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-NONSHARABLE_CLASS ( CSyncMLQueryTimer ) : public CTimer
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLQueryTimer* NewL( MSyncMLQueryTimerObserver* aObserver );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLQueryTimer();
-
-    public: // Functions from base classes
-
-        /**
-        * From CActive Is called when an event is received.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void RunL();
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLQueryTimer( MSyncMLQueryTimerObserver* aObserver );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    private:    // Data
-        // Pointer to the timer observer instance.
-        MSyncMLQueryTimerObserver*  iObserver;
-         
-    };
-
-#endif      // CSYNCMLQUERYTIMER_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLTimedDateQuery.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Date query with timeout.
-*
-*/
-
-
-
-#ifndef CSYNCMLTIMEDDATEQUERY_H
-#define CSYNCMLTIMEDDATEQUERY_H
-
-//  INCLUDES
-#include <AknQueryDialog.h>
-
-#include "SyncMLQueryTimer.h"
-
-// CONSTANTS
-const TInt  KSyncMLNNoTimeoutDate  = 0; // The query does not time out
-
-// CLASS DECLARATION
-
-/**
-*  Date query with timeout.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.2
-*/
-NONSHARABLE_CLASS ( CSyncMLTimedDateQuery ) : public CAknTimeQueryDialog,
-                                                 public MSyncMLQueryTimerObserver
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLTimedDateQuery* NewL(
-            TTime& aDate,const TDesC& aPromptText, TBool& aKeypress,
-                  TInt   aTimeout = KSyncMLNNoTimeoutDate );
-          
-        CSyncMLTimedDateQuery(TTime& aDate, TBool& aKeypress,TInt aTimeout = KSyncMLNNoTimeoutDate );
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLTimedDateQuery();
-
-    public: // Functions from base classes
-
-        /**
-        * From MSyncMLQueryTimerObserver Is called when the timer
-        * runs out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void TimerExpired();
-        
-    protected:  // Functions from base classes
-        
-        /**
-        * From CEikDialog Starts the dialog timer.
-        * Called after the dialog is laid out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void PostLayoutDynInitL();
-
-        /**
-        * From CEikDialog Determines if the dialog can be closed.
-        * @since Series 60 3.0
-        * @param aButtonId Identifier of the button pressed.
-        * @return None
-        */
-        TBool OkToExitL( TInt aButtonId );
-        
-        /** 
-        * Called by OfferkeyEventL(), gives a change to dismiss the query even with 
-        * keys different than Enter of Ok. 
-        */ 
-        TBool NeedToDismissQueryL(const TKeyEvent& aKeyEvent);
-        
-        /**
-        * Called by NeedToDismissQueryL(), gives a change to either accept or reject
-        * the query. Default implementation is to accept the query if the Left soft
-        * key is displayed and reject it otherwise. Left softkey is only displayed if
-        * the query has valid data into it.
-        */
-        void DismissQueryL();
-        
-    private:    // Data
-        // Number of seconds before the query is timed out. 0 = no timeout.
-        TInt               iTimeout;
-
-        // Pointer to the timer instance
-        CSyncMLQueryTimer*  iTimer;
-    public:    
-        //key press detection
-        TBool iKeypress;
-    };
-
-#endif      // CSYNCMLTIMEDMESSAGEQUERY_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLTimedInputTextQuery.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/*
-* Copyright (c) 2007 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:  InputText query with timeout.
-*
-*/
-
-
-
-#ifndef CSYNCMLTIMEDINPUTTEXTQUERY_H
-#define CSYNCMLTIMEDINPUTTEXTQUERY_H
-
-//  INCLUDES
-#include <AknQueryDialog.h>
-#include <SyncMLNotifierParams.h>
-#include "SyncMLQueryTimer.h"
-
-// CONSTANTS
-const TInt  KSyncMLNNoAlphanumTimeout  = 0; // The query does not time out
-
-// CLASS DECLARATION
-
-/**
-*  InputText query with timeout.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.2
-*/
-NONSHARABLE_CLASS ( CSyncMLTimedInputTextQuery ) : public CAknTextQueryDialog,
-                                                 public MSyncMLQueryTimerObserver
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLTimedInputTextQuery* NewL(
-            TDes& aInputText,const TDesC& aPromptText,
-            TBool& aKeypress, TInt   aTimeout = KSyncMLNNoAlphanumTimeout );
-          
-        CSyncMLTimedInputTextQuery(TDes& aDataText, TBool& aKeypress, TInt aTimeout = KSyncMLNNoAlphanumTimeout );
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLTimedInputTextQuery();
-        
-       
-
-    public: // Functions from base classes
-
-        /**
-        * From MSyncMLQueryTimerObserver Is called when the timer
-        * runs out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void TimerExpired();
-        
-        /**
-        * From CAknQueryDialog,method called when the Editor content changed
-        * @since Series 60 3.0
-        * @param aQueryControl,aEventType , aStatus
-        * @return None
-        */
-        TBool HandleQueryEditorStateEventL(CAknQueryControl* aQueryControl, 
-                              TQueryControlEvent aEventType, TQueryValidationStatus aStatus);
-        
-    protected:  // Functions from base classes
-        
-        /**
-        * From CEikDialog Starts the dialog timer.
-        * Called after the dialog is laid out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void PostLayoutDynInitL();
-
-        /**
-        * From CEikDialog Determines if the dialog can be closed.
-        * @since Series 60 3.0
-        * @param aButtonId Identifier of the button pressed.
-        * @return None
-        */
-        TBool OkToExitL( TInt aButtonId );
-        
-        /** 
-        * Called by OfferkeyEventL(), gives a change to dismiss the query even with 
-        * keys different than Enter of Ok. 
-        */ 
-        TBool NeedToDismissQueryL(const TKeyEvent& aKeyEvent);
-        
-        /**
-        * Called by NeedToDismissQueryL(), gives a change to either accept or reject
-        * the query. Default implementation is to accept the query if the Left soft
-        * key is displayed and reject it otherwise. Left softkey is only displayed if
-        * the query has valid data into it.
-        */
-        void DismissQueryL();
-        
-    private:    // Data
-        // Number of seconds before the query is timed out. 0 = no timeout.
-        TInt               iTimeout;
-
-        // Pointer to the timer instance
-        CSyncMLQueryTimer*  iTimer;
-    public:    
-        //Detecting key press
-        TBool iKeypress;
-        
-    };
-
-#endif      // CSYNCMLTIMEDMESSAGEQUERY_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLTimedMessageQuery.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Message query with timeout.
-*
-*/
-
-
-
-#ifndef CSYNCMLTIMEDMESSAGEQUERY_H
-#define CSYNCMLTIMEDMESSAGEQUERY_H
-
-//  INCLUDES
-#include <aknmessagequerydialog.h>
-
-#include "SyncMLQueryTimer.h"
-
-// CONSTANTS
-const TInt  KSyncMLNNoTimeout  = 0; // The query does not time out
-
-// CLASS DECLARATION
-
-/**
-*  Message query with timeout.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-NONSHARABLE_CLASS ( CSyncMLTimedMessageQuery ) : public CAknMessageQueryDialog,
-                                                 public MSyncMLQueryTimerObserver
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLTimedMessageQuery* NewL(
-            const TDesC& aMessage,
-                  TInt   aTimeout = KSyncMLNNoTimeout );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLTimedMessageQuery();
-
-    public: // Functions from base classes
-
-        /**
-        * From MSyncMLQueryTimerObserver Is called when the timer
-        * runs out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void TimerExpired();
-        
-    protected:  // Functions from base classes
-        
-        /**
-        * From CEikDialog Starts the dialog timer.
-        * Called after the dialog is laid out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void PostLayoutDynInitL();
-
-        /**
-        * From CEikDialog Determines if the dialog can be closed.
-        * @since Series 60 3.0
-        * @param aButtonId Identifier of the button pressed.
-        * @return None
-        */
-        TBool OkToExitL( TInt aButtonId );
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLTimedMessageQuery( TInt aTimeout = KSyncMLNNoTimeout );
-
-    private:    // Data
-        // Number of seconds before the query is timed out. 0 = no timeout.
-        TInt               iTimeout;
-
-        // Pointer to the timer instance
-        CSyncMLQueryTimer*  iTimer;
-    };
-
-#endif      // CSYNCMLTIMEDMESSAGEQUERY_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLTimedNumberQueryDialog.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Number Query dialog with timeout.
-*
-*/
-
-
-
-#ifndef CSYNCMLTIMEDNUMBERQUERYDIALOG_H
-#define CSYNCMLTIMEDNUMBERQUERYDIALOG_H
-
-//  INCLUDES
-#include <AknQueryDialog.h>
-
-#include "SyncMLQueryTimer.h"
-#include "SyncMLTimedMessageQuery.h"
-
-// CONSTANTS
-const TInt KSyncMLNotifierTimeout = 300; // 5 min timeout
-
-// CLASS DECLARATION
-
-/**
-*  Message query with timeout.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.2
-*/
-NONSHARABLE_CLASS ( CSyncMLTimedNumberQueryDialog ) : public CAknFloatingPointQueryDialog,
-                                                 public MSyncMLQueryTimerObserver
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLTimedNumberQueryDialog* NewL(
-            TReal& aValue, const TDesC& aIptext,TBool& aKeypress, 
-                  TInt   aTimeout = KSyncMLNNoTimeout );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLTimedNumberQueryDialog();
-       
-
-    public: // Functions from base classes
-
-        /**
-        * From MSyncMLQueryTimerObserver Is called when the timer
-        * runs out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void TimerExpired();
-        
-    protected:  // Functions from base classes
-        
-        /**
-        * From CEikDialog Starts the dialog timer.
-        * Called after the dialog is laid out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void PostLayoutDynInitL();
-
-        /**
-        * From CEikDialog Determines if the dialog can be closed.
-        * @since Series 60 3.0
-        * @param aButtonId Identifier of the button pressed.
-        * @return None
-        */
-        TBool OkToExitL( TInt aButtonId );
-        
-        /** 
-        * Called by OfferkeyEventL(), gives a change to dismiss the query even with 
-        * keys different than Enter of Ok. 
-        */ 
-        TBool NeedToDismissQueryL(const TKeyEvent& aKeyEvent);
-        
-        /**
-        * Called by NeedToDismissQueryL(), gives a change to either accept or reject
-        * the query. Default implementation is to accept the query if the Left soft
-        * key is displayed and reject it otherwise. Left softkey is only displayed if
-        * the query has valid data into it.
-        */
-        void DismissQueryL();
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLTimedNumberQueryDialog( TReal& aValue, TBool& aKeypress, TInt aTimeout = KSyncMLNNoTimeout );
-
-    private:    // Data
-        // Number of seconds before the query is timed out. 0 = no timeout.
-        TInt               iTimeout;
-
-        // Pointer to the timer instance
-        CSyncMLQueryTimer*  iTimer;
-     public:   
-        //Detecting the key press
-         TBool iKeypress;
-    };
-
-#endif      // CSYNCMLTIMEDQUERYDIALOG_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/SyncMLTimedQueryDialog.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Query dialog with timeout.
-*
-*/
-
-
-
-#ifndef CSYNCMLTIMEDQUERYDIALOG_H
-#define CSYNCMLTIMEDQUERYDIALOG_H
-
-//  INCLUDES
-#include <AknQueryDialog.h>
-
-#include "SyncMLQueryTimer.h"
-#include "SyncMLTimedMessageQuery.h"
-
-// CONSTANTS
-const TInt KSyncMLNotifierTimeout = 300; // 5 min timeout
-
-// CLASS DECLARATION
-
-/**
-*  Message query with timeout.
-*
-*  @lib SyncMLNotifier
-*  @since Series 60 3.0
-*/
-NONSHARABLE_CLASS ( CSyncMLTimedQueryDialog ) : public CAknQueryDialog,
-                                                 public MSyncMLQueryTimerObserver
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        */
-        static CSyncMLTimedQueryDialog* NewL(
-            const TDesC& aMessage,
-                  TInt   aTimeout = KSyncMLNNoTimeout );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CSyncMLTimedQueryDialog();
-
-    public: // Functions from base classes
-
-        /**
-        * From MSyncMLQueryTimerObserver Is called when the timer
-        * runs out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void TimerExpired();
-        
-    protected:  // Functions from base classes
-        
-        /**
-        * From CEikDialog Starts the dialog timer.
-        * Called after the dialog is laid out.
-        * @since Series 60 3.0
-        * @param None
-        * @return None
-        */
-        void PostLayoutDynInitL();
-
-        /**
-        * From CEikDialog Determines if the dialog can be closed.
-        * @since Series 60 3.0
-        * @param aButtonId Identifier of the button pressed.
-        * @return None
-        */
-        TBool OkToExitL( TInt aButtonId );
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CSyncMLTimedQueryDialog( TInt aTimeout = KSyncMLNNoTimeout );
-
-    private:    // Data
-        // Number of seconds before the query is timed out. 0 = no timeout.
-        TInt               iTimeout;
-
-        // Pointer to the timer instance
-        CSyncMLQueryTimer*  iTimer;
-    };
-
-#endif      // CSYNCMLTIMEDQUERYDIALOG_H   
-            
-// End of File
--- a/syncmlfw/syncmlnotifier/inc/syncmlmmcwatcher.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +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:  Synchronisation server alert notifier.
-*
-*/
-
-#ifndef SYNCMLMMCWATCHER_H_
-#define SYNCMLMMCWATCHER_H_
-#include <e32base.h>
-#include <e32property.h>
-#include <UikonInternalPSKeys.h>
-#include <f32file.h> 
-#include <disknotifyhandler.h> //if RD_MULTIPLE_DRIVE
-#include "SyncMLNotifDebug.h"
-
-/**
-*  MMC event observer class for SyncML notifier queries.
-*  @lib SyncMLNotifier
-*  @since Series 60 5.2
-*/
-NONSHARABLE_CLASS ( MSyncMLQueryMmcObserver )
-    {
-    public: // New functions
-        /**
-        * Is called when the mmc removes.
-        * @since Series 60 5.2
-        * @param None
-        * @return None
-        */
-        virtual void MmcRemoved() = 0;
-    };
-
-/**
-*  MMC event watcher class for SyncML notifier queries.
-*  @lib SyncMLNotifier
-*  @since Series 60 5.2
-*/
-class CSyncmlmmcwatcher :  public CBase, public MDiskNotifyHandlerCallback /*public CActive,*/
-    {                
-public:  // Constructors and destructor
-
-    /**
-     * Two-phased constructor.
-     */
-    static CSyncmlmmcwatcher* NewL( MSyncMLQueryMmcObserver* aObserver );
-
-    /**
-     * Destructor.
-     */     
-    virtual ~CSyncmlmmcwatcher();
-private:   
-    /**
-     * Constructor.
-     */
-    inline CSyncmlmmcwatcher( MSyncMLQueryMmcObserver* aObserver);       
-
-public:
-    /**
-     * Logs a request to notify the disk events
-     * @since Series 60 5.2
-     * @param None
-     * @return None
-     */
-    void StartL();
-    
-    /**
-     * Callback method to notify disk events
-     * @since Series 60 5.2
-     * @param aError,System wide error code from file server
-     * @param aEvent,The disk event data data specified by TDiskEvent
-     * @return None
-     */
-    void HandleNotifyDisk( TInt aError, const TDiskEvent& aEvent );
-    
-    /**
-     * Cancels the disk notification
-     * @since Series 60 5.2
-     * @param None     
-     * @return None
-     */
-    void CancelMmcwatch();
-
-private:
-
-    /**
-     * Symbian 2nd phase constructor.
-     */
-    void ConstructL();            
-
-private:            
-    //Instance to RFs
-    RFs iMemoryCard;
-    
-    // Pointer to disk notify handler. Own.
-    CDiskNotifyHandler* iDiskNotifyHandler;
-    
-    // Pointer to MMC observer
-    MSyncMLQueryMmcObserver* immcobserver;
-    }; 
-
-#endif /* SYNCMLMMCWATCHER_H_ */
-
--- a/syncmlfw/syncmlnotifier/loc/SyncMLNotifier.loc	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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:  Localisation file for SyncML framework.
-*
-*/
-
-
-
-// LOCALISATION STRINGS
-
-//d:Text of the popup query for the acceptance
-//d:of the server initiated synchronisation session.
-//l:popup_note_window_1
-//w:
-//r:3.0
-//
-#define qtn_ds_query_accept_configuration   "Server %U is about to synchronise. Accept?"
-
-//d:Text of the popup query for the acceptance
-//d:of the server initiated synchronisation session.
-//l:popup_note_window_1
-//w:
-//r:3.0
-//
-#define qtn_sml_server_message_heading      "Server message"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML server.
-//l:popup_note_window_1
-//w:
-//r:3.0
-//
-#define qtn_dm_query_accept_configuration   "Recommended update available from server %U. Download?"
-
-//d:Confirms that the user wants to connect to the Internet.
-//l:popup_note_window_1
-//w:
-//r:3.1
-//
-#define qtn_fota_conf_query_connection_is_needed   "You are about to connect to the Internet. Normal data call costs may apply. Connect?"
-
-//d:Information note to be shown for server started user informative session
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_dm_info_note_updating "Updating device from server %U"
-
-
-//d:Text of the prompt text of popup query for the acceptance
-//d:of the SyncML DM server initiated device management session.
-//l:heading_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_title_phone_management      "Phone management"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML server.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_accept_management_without_purpose   "Server %U wants to start phone management session with your phone. Accept?"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML Dm server for the purpose of configuration management 
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_management_configuration   "New configuration update is available from server %U. Accept?"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML DM server for the purpose of software management.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_management_software   "New software update is available from server %U. Accept?"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML DM server for the purpose of firmware management.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_management_firmware   "New phone software update is available from server %U. Accept?"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML server for the purpose of diagnostics.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_management_diagnostics   "Server %U wants to run some diagnostic tests on your phone. Accept?"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML server for the purpose of device control purpose.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_management_phone_control   "Server %U wants to have control of some features on your phone. Accept?"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML server for the purpose of Customization.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_management_customization   "Server %U wants to customize your phone.Accept?"
-
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML DM server for multiple purposes
-//d: After this string line feed should be added while showing
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_accept_management_with_purposes   "Server %U wants to start phone management session with your phone. Session contains:"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML DM server for multiple purposes, with Configuration update
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_accept_mgmt_purpose_configuration   "Configuration updates"
-
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML server for multiple purposes, with Software update
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_accept_mgmt_purpose_software   "Software updates"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML DM server for multiple purposes, with Phone software updates
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_accept_mgmt_purpose_firmware   "Phone software updates"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML server for multiple purposes, with Diagnostics
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_accept_mgmt_purpose_diagnostics   "Diagnostics"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML server for multiple purposes, with Phone Control
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_accept_mgmt_purpose_control   "Phone control"
-
-//d:Text of the popup query showing a note received
-//d:from a SyncML server for multiple purposes, with Phone customization
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_accept_mgmt_purpose_customization   "Phone customization"
-
-//d:Text of the popup query showing a note received
-//d:from a DM SyncML server for multiple purposes.
-//d:Should show accept string at last line after showing any of above 
-//d:multiple purposes string.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.0
-//
-#define qtn_dm_query_management_accept   "Accept?"
-
-
-//d:Text of the popup query for the acceptance
-//d:of the server initiated synchronisation session.
-//d:This message text is requested from operator 
-//d:The chinese text should be as per the one mentioned in Requirement
-//l:popup_note_window
-//r:5.0
-//
-#define qtn_dm_query_accept_postsale   "Accept Enhanced Post-sale Service?"
-
-//d:Information note to be shown for server started user informative session
-//d:This message text is requested from operator
-//d:This is indication that Device management session is started for 
-//d:the reason as text indicates 
-//d:The chinese text should be as per the one mentioned in Requirement
-//l:popup_note_window
-//r:5.0
-//
-#define qtn_dm_info_note_postsale "Enhanced Post-sale Service"
-
-// End of File
--- a/syncmlfw/syncmlnotifier/loc/SyncMLNotifierFota.loc	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,288 +0,0 @@
-/*
-* Copyright (c) 2005-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:  FOTA specific localisation file for SyncML framework.
-*
-*/
-
-
-
-// LOCALISATION STRINGS
-
-//d:Header text of the firmware update related message
-//d:queries.
-//l:heading_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_query_title_phone_updates  "Phone updates"
-
-//d:Text of the popup query indicating that the
-//d:firmware update was successful. Shown after
-//d:the phone has rebooted back to normal mode.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_notif_complete             "Update successful"
-
-//d:Text of the popup query indicating that the
-//d:firmware update was not successful and the phone
-//d:has not been updated. Shown after the phone
-//d:has rebooted back to normal mode.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_msg_query_not_updated      "The phone was not updated. The update package was not compatible with the phone. Please contact your service provider."
-
-//d:Text of the popup query indicating that there
-//d:is not enough power in the battery to perform
-//d:a firmware update. Shown before the phone reboots
-//d:to the update mode.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_battery_low                "Not enough battery power for update. Connect the charger now or update later."
-
-//d:Text of the popup query indicating that there
-//d:is not enough power in the battery to perform
-//d:a firmware update for USB charging support.
-//d:Shown before the phone reboots
-//d:to the update mode.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.2.3
-//
-#define qtn_fota_msg_query_update_usb_charger               "Connect the charger. You will be notified once the charging level reaches acceptable level."
-
-//d:Text of the popup query indicating that the connection
-//d:to FOTA server was lost during the download and the
-//d:package retrieval could not be finished.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_err_lost_connection        "Connection lost while downloading."
-
-//d:Text of the popup query indicating that the FOTA
-//d:or download server retuned an internal error when
-//d:the phone tried to access it.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_server_error               "Service error. Cannot perform update at this time."
-
-//d:Text of the popup query indicating that the
-//d:firmware update was not permitted. The cause
-//d:is usually the incompatibility of the update
-//d:package.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_not_permitted              "Update not permitted. Please contact your service provider."
-
-//d:Text of the confirmation query requesting if
-//d:the firmware update should be started. Asked
-//d:when the package has been retrieved. %U is the
-//d:name of the device management server, which initiated
-//d:the download.
-//l:popup_note_window_1
-//w:
-//r:3.1
-//
-#define qtn_fota_conf_query_install_now     "New software update downloaded from %U. Install now?"
-
-//d:Text of the first confirmation query describing the effect
-//d:of the firmware update and warning that the phone
-//d:will be unusable for several minutes. The user
-//d:may cancel the update at this stage.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_msg_query_update_1_warning   "Data and content back up is recommended before proceeding with installation."
-
-//d:Text of the second confirmation query describing the effect
-//d:of the firmware update and warning that the phone
-//d:will be unusable for several minutes. The user
-//d:may cancel the update at this stage.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_msg_query_update_2_warning   "Installation will proceed until complete. You will not be able to use your phone during the installation, even for emergencies. During the installation your phone will restart."
-
-//d:Text of the permanent note informing the user that
-//d:the phone is being rebooted because of the software
-//d:update.
-//l:popup_note_window_1
-//w:
-//r:3.1
-//
-#define qtn_fota_restarting_for_update      "Restarting for update..."
-
-//d:Text of the popup query informing user that
-//d:the update installation was canceled. Shown if
-//d:the user rejects the "install now" query and the
-//d:manual installation is not allowed.
-//l:popup_note_window_1
-//w:
-//r:3.1
-//
-#define qtn_fota_conf_note_installing_cancelled "Installing cancelled"
-
-//d:Text of the popup query informing user that
-//d:the update installation can be started from the
-//d:Device Manager application. Shown if the user
-//d:rejects the "install now" query.
-//l:popup_info_list_pane_t1
-//w:
-//r:3.1
-//
-#define qtn_fota_msg_query_update_reminder  "To update your phone later, select Install update in Device Manager."
-
-//d:Text of the popup message query informing user that
-//d:no enough memory for downloading the large object.
-//d:%N displays how much memory in KB needed for downloading Update package 
-//l:popup_info_list_pane_t1
-//r:3.2
-//
-#define qtn_fota_note_not_enough_disk_space "Device was not updated. Not enough memory for update. %N kB free memory needed for update."
-//d:Text of the popup message query informing user that
-//d:no enough memory for downloading using OMA Download.
-//d:%N displays how much memory in KB needed for downloading Update package 
-//l:popup_info_list_pane_t1
-//r:3.2
-//
-#define qtn_fota_querry_not_enough_disk_space "Not enough memory for update.%N kB free memory needed for update. Delete some data now or update later."
-//d:Text for the left soft key of update package 
-//d:install popup query after downloading the package
-//d:Selecting "Now" starts installation
-//l:control_pane_t1/opt3
-//r:3.2
-//
-#define text_softkey_now "Now"
-//d:Text for the right soft key of update package 
-//d:install popup query after downloading the package 
-//d:Selecting "Later" shows remainder dialog
-//l:control_pane_t1/opt3
-//r:3.2
-//
-#define text_softkey_later "Later"
-
-//d:Text of the confirmation query requesting if
-//d:the firmware update should be started. Asked
-//d:when the package has been retrieved. 
-//d:The chinese text should be as per the one mentioned in Requirement
-//l:popup_info_list_pane_t1 
-//r:5.0
-//
-#define qtn_fota_msg_query_update_custom_warning     "New software update downloaded. The software updating might take 10 minutes. During the updating, all the functions will be unavailable, including emergency call.  Update now?"
-
-// new localization for FOTA Suspend&Resume
-
-//d:Text of the popup message query informing user that
-//d:connection was lost downloading using OMA Download.
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_fota_query_download_conn_lost  "Connection was lost during download. You can continue downloading phone software update later when connection is available."
-
-//d:Text of the popup message query asking user 
-//d:if download can be continued now or later
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_fota_query_download_continue 	"Do you want to continue downloading phone software update later?"
-
-//d:Text of the popup message query informing user that
-//d:download is postponed
-//l:popup_note_window
-//r:5.0
-//
-#define qtn_fota_query_download_postponed		"Download postponed."
-
-//d:Text of the popup message query 
-//d:Asking user when he chooses to resume option to continue downloading
-//l:popup_info_list_pane_t1
-//r:5.0
-//
-#define qtn_fota_query_download_resume	"Do you want to continue phone software update?"
-
-//d:Text of the popup query indicating that the
-//d:download is cancelled.
-//l:popup_note_window
-//r:5.0
-//
-#define qtn_fota_query_download_cancelled			  "Download Cancelled."
-
-//d:Text of the information indicating user that  
-//d:there was an error occurred during download
-//d:And downloading can be resumed later 
-//l:popup_info_list_pane_t1 
-//r:5.0
-//
-
-#define qtn_fota_query_download_error_continue "An error occurred during download. You can continue downloading phone software update later."
-
-//d:Text of the information indicating user that  
-//d:there was an error occurred and 
-//d:user has to perform check for updates again. 
-//l:popup_info_list_pane_t1 
-//r:5.0
-//
-
-#define qtn_fota_query_download_error_restart "An error occurred during download. Please restart phone software update."
-
-//d:Text of the confirmation query when phone memory is encrypted.
-//d:Firmware update might take more time as memory has to be decrypted first
-//d:before performing the update. The duration of decryption depends on the memory size and how much data is in.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.2
-//
-
-#define qtn_fota_msg_query_update_dec_warning   "You will not be able to use your phone during the installation, even for emergencies. During the installation your phone will restart. Installation might take few minutes because of the memory decryption and it will proceed until complete."
-
-//d:Text of the confirmation query when phone memory has to be encrypted.
-//d:Once firmware is updated on a phone that had encrypted memory, user is
-//d:prompted to encrypt the memory back. When user denies, the phone memory is not encrypted.
-//d:This query will be combined with the firmware update status note.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.2
-//
-
-#define qtn_fota_msg_query_update_encrypt   "\nDo you want to encrypt your phone memory again? It might take few minutes and you are not able to use your phone during encryption."
-
-//d:Error message shown when battery is low to start encryption.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.2
-//
-
-#define qtn_fota_battery_encryption_low   "Battery  too low.  Connect power adapter and encrypt."
-
-//d:Error message shown when user starts firmware installation while encryption or decryption is ongoing in background.
-//l:popup_info_list_pane_t1
-//w:
-//r:5.2
-//
-
-#define qtn_fota_device_busy   "Device memory is busy. Try installation later."
-
-// End of File
--- a/syncmlfw/syncmlnotifier/rom/SyncMLNotifier.iby	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2005 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:  IBY file for the SyncML notifier component.
-*
-*/
-
-
-#ifndef SYNCMLNOTIFIER_IBY
-#define SYNCMLNOTIFIER_IBY
-
-// Should only be included if at least one of the SyncML components is included
-#if defined(__SYNCML_DS) || defined(__SYNCML_DM)
-
-file = ABI_DIR\BUILD_DIR\SyncMLNotifier.dll             SHARED_LIB_DIR\SyncMLNotifier.dll
-ECOM_PLUGIN( SyncMLNotifierWrapper.dll, 101F876A.rsc )
-
-#ifdef __SERIES60_30__
-file = ABI_DIR\BUILD_DIR\SyncMLNotifierAppServer.exe    PROGRAMS_DIR\SyncMLNotifierAppServer.exe
-data = DATAZ_\Private\10003a3f\Apps\SyncMLNotifierAppServer_reg.rsc Private\10003a3f\apps\SyncMLNotifierAppServer_reg.rsc
-#endif // __SERIES60_30__
-
-#endif // defined(__SYNCML_DS) || defined(__SYNCML_DM)
-
-#endif // SYNCMLNOTIFIER_IBY
-
-//  End of File
\ No newline at end of file
--- a/syncmlfw/syncmlnotifier/rom/SyncMLNotifierResources.iby	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2005 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:  IBY file for the SyncML notifier component localisable
-*                resources.
-*
-*/
-
-
-#ifndef SYNCMLNOTIFIERRESOURCES_IBY
-#define SYNCMLNOTIFIERRESOURCES_IBY
-
-// Should only be included if at least one of the SyncML components is included
-#if defined(__SYNCML_DS) || defined(__SYNCML_DM)
-
-data = DATAZ_\RESOURCE_FILES_DIR\SyncMLNotifier.rsc     RESOURCE_FILES_DIR\SyncMLNotifier.rsc
-
-#endif // defined(__SYNCML_DS) || defined(__SYNCML_DM)
-
-#endif // SYNCMLNOTIFIERRESOURCES_IBY
-
-//  End of File
\ No newline at end of file
--- a/syncmlfw/syncmlnotifier/src/SyncMLAknPopUpList.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +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:  Methods to parse the server alert messages for data sync and device
-*                Management frameworks. Launches respective application 
-*                in appropriate conditions
-*
-*/
-
-#include "SyncMLAknPopUplist.h"
-
-const TInt  KSyncMLuSecsInSec   = 1000000; // Microseconds in a second
-
-// -----------------------------------------------------------------------------
-// CSyncMLAknPopUpList::CSyncMLAknPopUpList()
-// Constructor
-// -----------------------------------------------------------------------------
-//
-CSyncMLAknPopUpList::CSyncMLAknPopUpList(TInt aTimeout ):CAknPopupList()
-    {
-    iTimeout = aTimeout;
-    iMmcwatcher = NULL;
-    iTimer = NULL;
-	immcremoved = EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAknPopUpList::NewL()
-// -----------------------------------------------------------------------------
-//
-CSyncMLAknPopUpList* CSyncMLAknPopUpList::NewL(CAknSingleHeadingPopupMenuStyleListBox* listBox,
-        TInt aResId,AknPopupLayouts::TAknPopupLayouts aPopuplayout,
-        TInt   aTimeout  )
-    {
-    CSyncMLAknPopUpList* self = new( ELeave ) CSyncMLAknPopUpList(aTimeout);
-    CleanupStack::PushL( self );
-    self->ConstructL(listBox,aResId,aPopuplayout );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAknPopUpList::ConstructL()
-// Second phase constructor
-// -----------------------------------------------------------------------------
-//
-void CSyncMLAknPopUpList::ConstructL(CAknSingleHeadingPopupMenuStyleListBox* aListBox, 
-                                     TInt aCbaResource,
-                                     AknPopupLayouts::TAknPopupLayouts aType )
-    {
-    CAknPopupList::ConstructL(aListBox,aCbaResource,aType);
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAknPopUpList::~CSyncMLAknPopUpList()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLAknPopUpList::~CSyncMLAknPopUpList()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        }
-   
-    if(iMmcwatcher)
-        {
-        iMmcwatcher->CancelMmcwatch();
-        delete iMmcwatcher;
-        iMmcwatcher = NULL;
-        }
-    }
- 
-// -----------------------------------------------------------------------------
-// CSyncMLAknPopUpList::TimerExpired
-// -----------------------------------------------------------------------------
-//
-void CSyncMLAknPopUpList::TimerExpired()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        iTimeout = KSyncMLNNoListTimeout;
-        }
-    if(iMmcwatcher)
-        {
-        iMmcwatcher->CancelMmcwatch();
-        }
-    CancelPopup();
-       
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLAknPopUpList::ExecuteLD
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLAknPopUpList::ExecuteLD()
-    {
-    if ( iTimeout > KSyncMLNNoListTimeout )
-        {
-        iTimer = CSyncMLQueryTimer::NewL( this );
-        iTimer->After( iTimeout * KSyncMLuSecsInSec );
-        }
-    iMmcwatcher = CSyncmlmmcwatcher::NewL(this);
-    iMmcwatcher->StartL();
-    return CAknPopupList::ExecuteLD();
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAknPopUpList::MmcRemoved
-// -----------------------------------------------------------------------------
-//
-void CSyncMLAknPopUpList::MmcRemoved()
-    {
-    FLOG(_L("CSyncMLAknPopUpList::MmcRemoved- cancelling the pop up"));
-	immcremoved = ETrue;
-    CancelPopup();
-    FLOG(_L("CSyncMLAknPopUpList::MmcRemoved- cancelling the pop up done"));
-    }
-	
-// -----------------------------------------------------------------------------
-// CSyncMLAknPopUpList::IsMmcRemoved
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLAknPopUpList::IsMmcRemoved()
-    {
-    return immcremoved;
-    }
--- a/syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,772 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Methods to parse the server alert messages for data sync and device
-*                Management frameworks. Launches respective application 
-*                in appropriate conditions
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <eikenv.h>          // Eikon environment
-#include <AknQueryDialog.h>
-#include <StringLoader.h>    // Localisation stringloader
-#include <SyncMLClientDS.h>
-#include <SyncMLClientDM.h>
-#include <SyncMLClient.h>
-#include <rconnmon.h>
-#include <centralrepository.h>
-#include <SyncMLNotifierDomainCRKeys.h>
-#include <SyncMLNotifier.rsg>           // Own resources
-#include "SyncMLAppLaunchNotifier.h"    // Class declaration
-#include "SyncMLTimedMessageQuery.h"
-#include "SyncMLTimedQueryDialog.h"
-#include "SyncMLNotifDebug.h"
-#include <aknnotewrappers.h>
-#include <DevManInternalCRKeys.h>
-#include "nsmlconstantdefs.h"
-
-
-// CONSTANTS
-_LIT( KSmlNPanicCategory, "SyncMLNotifier");
-
-// medium type uids
-//const TUid KUidNSmlMediumTypeInternet  = { 0x101F99F0 };
-const TUid KUidNSmlMediumTypeBluetooth = { 0x101F99F1 };
-const TUid KUidNSmlMediumTypeUSB       = { 0x101F99F2 };
-const TUid KUidNSmlMediumTypeIrDA      = { 0x101F99F3 };
-
-
-enum TASpBearerType
-    {
-    EAspBearerInternet = 0,
-    EAspBearerUsb = 1,
-    EAspBearerBlueTooth = 2,
-    EAspBearerIrda = 3,
-    EAspBearerWsp = 4,
-    EAspBearerSmlUsb = 5,
-    EAspBearerLast = 6
-    };
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLAppLaunchNotifier::CSyncMLAppLaunchNotifier
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLAppLaunchNotifier::CSyncMLAppLaunchNotifier() :
-    iAlwaysAsk( EFalse )
-    {
-    iBearerType = KErrNotFound;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLDSNotifier::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLAppLaunchNotifier* CSyncMLAppLaunchNotifier::NewL()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::NewL()"));
-    CSyncMLAppLaunchNotifier* self = new (ELeave) CSyncMLAppLaunchNotifier();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::NewL() completed"));
-    return self;
-    }
-
-    
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CSyncMLAppLaunchNotifier::~CSyncMLAppLaunchNotifier()
-    {
-    delete iDMSyncService;
-    delete iDSSyncService;
-    Cancel();   // Free own resources
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAppLaunchNotifier::RetrieveSyncParams
-// Leaves if the job identifier is not found.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLAppLaunchNotifier::RetrieveSyncParamsL(
-    TSyncServiceParam& aParam,
-    TDes& aServerName,
-    TSmlServerAlertedAction& aUserInteraction )
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RetrieveSyncParamsL()"));
-    TSmlJobId currentJobId;
-    TSmlUsageType usageType;
-    
-    // sync session
-    RSyncMLSession syncSession;
-    syncSession.OpenL();
-    CleanupClosePushL( syncSession );
-    syncSession.CurrentJobL( currentJobId, usageType );
-
-    if ( currentJobId == iJobId &&
-         usageType == ESmlDataSync )
-        {
-        RSyncMLDataSyncProfile syncProfile;
-        syncProfile.OpenL( syncSession, iProfileId, ESmlOpenRead );
-        CleanupClosePushL( syncProfile );
-        
-        aParam.iProfileId = iProfileId;
-        aParam.iJobId = iJobId;
-        aServerName = syncProfile.DisplayName();
-        aUserInteraction = syncProfile.SanUserInteraction();
-        
-        // Check if always ask is selected as accesspoint
-        RSyncMLConnection connection;
-        TRAPD( iapError, connection.OpenL( syncProfile, KUidNSmlMediumTypeInternet.iUid ) );
-        CleanupClosePushL( connection );
-
-        if ( !iapError )
-            {
-            const TDesC8& iap = connection.GetPropertyL( KNSmlIAPId );
-            if ( iap.Compare( KNSmlAlwaysAsk() ) == 0 )
-                {
-                iAlwaysAsk = ETrue;
-                }            
-            
-            TInt id = connection.Identifier();
-            if (id == KUidNSmlMediumTypeInternet.iUid)
-                {
-                iBearerType = EAspBearerInternet;
-                }
-            else if (id == KUidNSmlMediumTypeBluetooth.iUid)
-                {
-                iBearerType = EAspBearerBlueTooth;
-                }
-            else if (id == KUidNSmlMediumTypeUSB.iUid)
-                {
-                iBearerType = EAspBearerUsb;
-                }
-            else if (id == KUidNSmlMediumTypeIrDA.iUid)
-                {
-                iBearerType = EAspBearerIrda;
-                }
-            else
-                {
-                iBearerType = KErrNotFound;
-                }            
-            }
-
-        connection.Close();
-        CleanupStack::Pop( &connection );
-        
-        syncProfile.Close();
-        CleanupStack::Pop( &syncProfile );
-        }
-    else
-        {
-        FTRACE( FPrint(
-            _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RetrieveSyncParamsL() Could not find job %d"),
-            iJobId ) );
-        User::Leave( KErrNotFound );
-        }
-    
-    syncSession.Close();
-    CleanupStack::Pop( &syncSession );
-
-    FTRACE( FPrint(
-        _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RetrieveSyncParamsL() completed, aServerName = \"%S\""),
-        &aServerName ) );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAppLaunchNotifier::RetrieveMgmtParamsL
-// Leaves if the job identifier is not found.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLAppLaunchNotifier::RetrieveMgmtParamsL(
-    TSyncServiceParam& aParam,
-    TDes& aServerName,
-    TSmlServerAlertedAction& aUserInteraction )
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RetrieveMgmtParamsL()"));
-
-    TSmlJobId currentJobId;
-    TSmlUsageType usageType;
-    
-    RSyncMLSession syncSession;
-    
-    syncSession.OpenL();
-    CleanupClosePushL( syncSession );
-    
-    syncSession.CurrentJobL( currentJobId, usageType );
-    
-    if ( currentJobId == iJobId &&
-         usageType == ESmlDevMan )
-        {
-        RSyncMLDevManProfile syncProfile;
-        syncProfile.OpenL( syncSession, iProfileId, ESmlOpenRead );
-        CleanupClosePushL( syncProfile );
-        
-        aParam.iProfileId = iProfileId;
-        aParam.iJobId = iJobId;
-        aServerName = syncProfile.DisplayName();
-        aUserInteraction = syncProfile.SanUserInteraction();
-        
-        // Check if always ask is selected as accesspoint
-        RSyncMLConnection connection;
-        TRAPD( iapError, connection.OpenL( syncProfile, KUidNSmlMediumTypeInternet.iUid ) );
-        CleanupClosePushL( connection );
-
-        if ( !iapError )
-            {
-            const TDesC8& iap = connection.GetPropertyL( KNSmlIAPId );
-            if ( iap.Compare( KNSmlAlwaysAsk() ) == 0 )
-                {
-                iAlwaysAsk = ETrue;
-                }            
-            }
-
-        connection.Close();
-        CleanupStack::Pop( &connection );
-        
-        syncProfile.Close();
-        CleanupStack::Pop( &syncProfile );
-        }
-    else
-        {
-        FTRACE( FPrint(
-            _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RetrieveMgmtParamsL() Could not find job %d"),
-            iJobId ) );
-        User::Leave( KErrNotFound );
-        }
-    
-    syncSession.Close();
-    CleanupStack::Pop( &syncSession );
-
-    FTRACE( FPrint(
-        _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RetrieveMgmtParamsL() completed, aServerName = \"%S\""),
-        &aServerName ) );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAppLaunchNotifier::IsSilent
-// Only automatic acception from the profile is checked, since notifier has no
-// information about the preferences included in the server alert.
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLAppLaunchNotifier::IsSilent(
-    TSmlServerAlertedAction& aUserInteraction )
-    {
-    TBool retval = EFalse;
-    if ( aUserInteraction == ESmlEnableSync )
-        {
-        retval = ETrue;
-        }
-    return retval;
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLAppLaunchNotifier::RegisterL
-// -----------------------------------------------------------------------------
-//
-CSyncMLAppLaunchNotifier::TNotifierInfo CSyncMLAppLaunchNotifier::RegisterL()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RegisterL()"));
-    iInfo.iUid = KSyncMLAppLaunchNotifierUid;
-    iInfo.iChannel = KSmlAppLaunchChannel;
-    iInfo.iPriority = ENotifierPriorityVHigh;
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RegisterL() completed"));
-    return iInfo;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAppLaunchNotifier::Cancel
-// Release all own resources (member variables)
-// -----------------------------------------------------------------------------
-//
-void CSyncMLAppLaunchNotifier::Cancel()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::Cancel()"));
-
-    CSyncMLNotifierBase::Cancel();
-
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::Cancel() completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAppLaunchNotifier::GetParamsL
-// Initialize parameters and check if device is already
-// in registry. Jump to RunL as soon as possible.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLAppLaunchNotifier::GetParamsL( const TDesC8& aBuffer,
-                                                 TInt aReplySlot,
-                                           const RMessagePtr2& aMessage )
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::GetParamsL()"));
-
-    if( iReplySlot != NULL || iNeedToCompleteMessage )
-        {
-        User::Leave( KErrInUse );
-        }
-    
-    iMessage = aMessage;
-    iNeedToCompleteMessage = ETrue;
-    iReplySlot = aReplySlot;
-    iAlwaysAsk = EFalse;
-
-	TSyncMLAppLaunchNotifParams param;
- 	TPckgC<TSyncMLAppLaunchNotifParams> pckg( param );
- 	pckg.Set(aBuffer);
-
-    iSmlProtocol = pckg().iSessionType;
-    iJobId = pckg().iJobId;
-    iProfileId = pckg().iProfileId;
- TInt SanSupport( KErrNone );
-CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );    
-    User::LeaveIfError( err );
-    centrep->Get( KDevManSANUIBitVariation, SanSupport );
-    delete centrep;
-	if( SanSupport == EON )
-   	{
-     iUimode = pckg().iUimode;
-   	}    
-    // Call SetActive() so RunL() will be called by the active scheduler
-    //
-    SetActive();
-    iStatus = KRequestPending;
-    TRequestStatus* stat = &iStatus;
-    User::RequestComplete( stat, KErrNone );
-
-    FTRACE( FPrint(
-        _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::GetParamsL() completed, iSmlProtocol = %d, iJobId = %d, iProfileId = %d"),
-        iSmlProtocol, iJobId, iProfileId ) );
-    }
-
-// -----------------------------------------------------------------------------
-// CAspSyncHandler::ReadRepositoryL
-//
-// -----------------------------------------------------------------------------
-//
-void CSyncMLAppLaunchNotifier::ReadRepositoryL(TInt aKey, TInt& aValue)
-    {
-    CRepository* rep = CRepository::NewLC(KCRUidNSmlDSApp);
-    TInt err = rep->Get(aKey, aValue);
-    User::LeaveIfError(err);
-    
-    CleanupStack::PopAndDestroy(rep);
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLAppLaunchNotifier::RunL
-// Ask user response and return it to caller.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLAppLaunchNotifier::RunL()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL()"));
-		stringholder =NULL;
-		centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );    
-    if(err)
-    {
-    	centrep = NULL;
-    }
-
-    TLanguage language = User::Language();  
-    // Load the parameters and set the query text according to the session type.
-    switch( iSmlProtocol )
-        {
-        case ESyncMLSyncSession:
-            {
-            FLOG( _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() Synchronisation session") );
-
-            TBuf<KSyncMLMaxProfileNameLength> serverName;
-            RetrieveSyncParamsL( param, serverName, uiAction );
-            stringholder = StringLoader::LoadL( R_SML_INIT_DS_SERVER_PROMPT,
-                                                serverName );
-            }
-			break;
-        case ESyncMLMgmtSession:
-            {
-            	TBool status = HandleDMSessionL();
-            	if( !status )
-            		return;
-            }
-            break;
-        default: // Unknown value
-            {
-            FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() unknown protocol value"));
-            User::Leave( KErrArgument ); // Leave handling completes the message
-            return;
-            }
-        }
-
-    CleanupStack::PushL( stringholder );
-
-    TInt keypress( 0 );
-    TBool  silent = EFalse;
-		TInt SanSupport( KErrNone ),Timeout( KErrNone),CustomNotes(KErrNone);;
-    if(centrep)
-    {centrep->Get( KDevManSANUIBitVariation, SanSupport );
-     centrep->Get( KDevManServerAlertTimeout, Timeout );
-     centrep->Get( KDevManUINotesCustomization, CustomNotes);	
-    }
-    else
-    {
-    	  SanSupport = KErrNone;
-        Timeout = KDefaultTimeoutforNotes; 
-        CustomNotes = KErrNone ;
-    }   
-    Timeout = Timeout * 60 ;// converting to mins
-    delete centrep;
-		if(( SanSupport == EON )&& ( iSmlProtocol == ESyncMLMgmtSession))
-   	{
-    if( iUimode > ESANUserInteractive && iUimode < ESANNotSpecified )
-    	{
-    	iUimode = ESANNotSpecified;
-    	}
-    switch( iUimode ) 	
-    	{
-    		case ESANNotSpecified://not specified
-    		case ESANUserInteractive://user interactive session
-    		      silent = EFalse;    		      
-    		      break;
-    		case ESANSilent://Background
-    		case ESANUserInformative://Informative session
-    		      silent =  ETrue;//IsSilent( uiAction );     		      
-    		      break;  
-    	}
-   }
-   else
-       {
-       	silent =  IsSilent( uiAction );
-       }
-    if ( iAlwaysAsk && iSmlProtocol == ESyncMLMgmtSession )	//check with synergy    
-    	{
-    	silent = EFalse;
-    	}
-    if ( !silent || iAlwaysAsk )
-        {
-        // Turn lights on and deactivate apps -key
-        TurnLightsOn();  
-        SuppressAppSwitching( ETrue );
-
-        CSyncMLTimedQueryDialog* dlg =
-                CSyncMLTimedQueryDialog::NewL( *stringholder,
-                                               Timeout );    
-            
-        // Pushed dialog is popped inside RunLD
-        dlg->PrepareLC( R_SML_CONFIRMATION_QUERY );
-        
-        	dlg->ButtonGroupContainer().SetCommandSetL(
-        	        					R_AVKON_SOFTKEYS_YES_NO__YES );
-        keypress = dlg->RunLD();
-        dlg = NULL;
-        // Activate apps -key again
-        //
-        SuppressAppSwitching( EFalse );
-        }
-
-    CleanupStack::PopAndDestroy( stringholder );
-    
-    if ( iNeedToCompleteMessage ) // Notifier is not cancelled
-        {
-        	HandleCompleteMessageL(keypress, silent, SanSupport, Timeout, CustomNotes);
-        }
-
-    iNeedToCompleteMessage = EFalse;
-    iReplySlot = NULL;
-
-    iSmlProtocol = ESyncMLUnknownSession;
-    iJobId = 0;
-
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::SyncServiceL
-// -----------------------------------------------------------------------------
-//
-CSyncService* CSyncMLAppLaunchNotifier::SyncServiceL( TUint aServiceId )
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::SyncService"));
-
-    if ( aServiceId == KDevManServiceStart )
-        {
-        if ( !iDMSyncService )
-            {
-            FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::SyncServiceL() DM NewL"));
-            iDMSyncService = CSyncService::NewL( NULL, KDevManServiceStart );
-            }
-        return iDMSyncService;
-        }
-    else
-        {
-        if ( !iDSSyncService )
-            {
-            FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::SyncServiceL() DS NewL"));
-            iDSSyncService = CSyncService::NewL( NULL, KDataSyncServiceStart );
-            }
-        return iDSSyncService;
-        }
-    }
-//------------------------------------------------------------------------------
-//CSyncMLAppLaunchNotifier::IsRoaming(TBool& ret)
-//Returns true if roaming otherwise returns false
- 
-//------------------------------------------------------------------------------
-
-void CSyncMLAppLaunchNotifier::IsRoamingL(TBool &ret)
-	{
-	  FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::IsRoaming() Begin"));
-		RConnectionMonitor monitor;
-	  TRequestStatus status;
-		// open RConnectionMonitor object
-		monitor.ConnectL();
-		CleanupClosePushL( monitor );
-		TInt netwStatus(0);
-		monitor.GetIntAttribute( EBearerIdGPRS, // See bearer ids from TConnMonBearerId
-	                         0, 
-	                         KNetworkRegistration,
-	                         netwStatus, 
-	                         status );
-	  User::WaitForRequest( status );
-	  if ( status.Int() == KErrNone )
-	 	   {
-				switch(netwStatus)
-				{
-					case ENetworkRegistrationRoaming :
-					{
-						FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::IsRoaming() ENetworkRegistrationRoaming"));
-						ret=true;
-						break;
-					}
-		   		default:
-			 		{
-			 			FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::IsRoaming() Roaming status "));
-			 			FTRACE( FPrint(
-					  _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::IsRoamingL() cell is not in roaming, network status is  %d"), netwStatus ) );
-			 			break;	
-			 		}
-			}
-			CleanupStack::PopAndDestroy();
-		}
-		else
-			{
-				FTRACE( FPrint(
-			  _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::IsRoamingL() RConnectinMonitor status.Int() returned error %d"), status.Int() ) );
-			}
-	}
-//------------------------------------------------------------------------------
-//CSyncMLAppLaunchNotifier::HandleDMSessionL()
-//Handles the DM Session 
-//------------------------------------------------------------------------------
-
-TBool CSyncMLAppLaunchNotifier::HandleDMSessionL()
-{
-		FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::HandleDMSessionL begins"));
-		TBool ret(ETrue);
-		TInt dmroamingBlock = 0;
-    TBool roaming = EFalse;
-    TLanguage language = User::Language();
-	  FLOG( _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() Management session") );
-		CRepository* cRepository=NULL;
-		TRAPD ( error, cRepository = CRepository::NewL ( KCRUidNSmlNotifierDomainKeys ) );
-		if ( error == KErrNone )
-		{
-			CleanupStack::PushL( cRepository );
-			cRepository->Get ( KNSmlDMBlockedInRoaming, dmroamingBlock );
-			if(dmroamingBlock==1)
-			{
-				FLOG( _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() roaming feature is enabled") );
-				TRAPD(rError,IsRoamingL(roaming));
-				if( (rError==KErrNone) && roaming )
-				{
-					FLOG( _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() phone is in roaming, DM session is blocked ") );
-					CleanupStack::PopAndDestroy( cRepository );//cRepository
-					iNeedToCompleteMessage=EFalse;
-					iReplySlot = NULL;
-					ret = EFalse;
-					return ret;
-				}
-				else
-				{
-					FTRACE( FPrint(
-								_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() error in getting Network status  %d"), rError ) );
-          FTRACE( FPrint(
-          			_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() error in getting Network status  %d"),roaming ) );
-									}
-				}
-				else
-				{
-					FLOG( _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() DM blocking feature disabled ") );
-				}
-				CleanupStack::PopAndDestroy( cRepository );//cRepository
-			}
-			else
-			{
-				FTRACE( FPrint(
-            _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() cenrep creation error code  %d"),
-            error ) );
-			}
-      TBuf<KSyncMLMaxProfileNameLength> serverName;
-      RetrieveMgmtParamsL( param, DMSyncServerName, uiAction );            
-      TInt CustomNotes(KErrNone), SanSupport( KErrNone );  
-      CRepository* centrep = NULL;  
-      TRAPD(err1, centrep = CRepository::NewL ( KCRUidDeviceManagementInternalKeys ) );
-      if((centrep) && (err1 == KErrNone))
-      {
-      	centrep->Get( KDevManUINotesCustomization, CustomNotes);
-        centrep->Get( KDevManSANUIBitVariation, SanSupport );
-      }
-      else
-      {
-      	CustomNotes = 0;
-        SanSupport  = 0;	
-      }
-      delete centrep;             
-                                                        
-      if(CustomNotes && SanSupport && IsLanguageSupportedL())
-      {
-      	stringholder = StringLoader::LoadL( R_QTN_DM_QUERY_ACCEPT_POSTSALE);	//This note will be shown in chinese variant itself 
-      }
-      else
-      { 
-      	stringholder = StringLoader::LoadL( R_SML_INIT_DM_SERVER_PROMPT,DMSyncServerName );
-      }      
-      FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::HandleDMSessionL ends"));
-      return ret;
-}
-
-//------------------------------------------------------------------------------
-//CSyncMLAppLaunchNotifier::HandleCompleteMessageL(TInt &keypress, TBool &silent, TInt &SanSupport, TInt &Timeout, TInt &CustomNotes)
-// Handle the complete message
-//------------------------------------------------------------------------------
-	
-void CSyncMLAppLaunchNotifier::HandleCompleteMessageL(TInt &keypress, TBool &silent, TInt &SanSupport, TInt &Timeout, TInt &CustomNotes)
-{
-	TLanguage language = User::Language();
-	if( keypress == EAknSoftkeyYes || keypress == EAknSoftkeyOk || silent ) // User has accepted the dialog
-  {
-		TInt retval = 1; // Default for ESyncMLSyncSession or silent
-    if ( iSmlProtocol == ESyncMLMgmtSession && !silent )
-    {
-    	CRepository* cRepository=NULL;
-			TRAPD ( error, cRepository = CRepository::NewL ( KCRUidNSmlNotifierDomainKeys ) );
-		 	if ( error == KErrNone )
-			{
-				CleanupStack::PushL( cRepository );
-				TInt dmChargingNote(1);
-				cRepository->Get ( KNSmlDMChargingNote, dmChargingNote );
-				if(dmChargingNote==1)
-				{
-			    	stringholder = StringLoader::LoadLC( R_FOTA_CONF_QUERY_CONNECTION_IS_NEEDED );
-			    	CSyncMLTimedQueryDialog* dlg = CSyncMLTimedQueryDialog::NewL( *stringholder, Timeout );			    
-			    	dlg->PrepareLC( R_SML_CONFIRMATION_QUERY );
-        		dlg->ButtonGroupContainer().SetCommandSetL( R_AVKON_SOFTKEYS_YES_NO );
-       			keypress = dlg->RunLD();
-         		if( keypress == EAknSoftkeyYes ||	keypress == EAknSoftkeyOk ) 
-         			retval = 1;
-         		else retval = 0;   
-			    	dlg = NULL;
-			    	CleanupStack::PopAndDestroy( stringholder );
-        }
-        CleanupStack::PopAndDestroy( cRepository );//cRepository
-      }
-    }
-	if( iSmlProtocol == ESyncMLMgmtSession && SanSupport == EON && silent && iUimode == ESANUserInformative )
-	{
-		// Turn lights on and deactivate apps -key
-  	TurnLightsOn(); 	  
-   	if(CustomNotes && IsLanguageSupportedL()) 
-   	{
-   		FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::informative session inside if "));
-  		stringholder = StringLoader::LoadLC(R_QTN_DM_INFO_NOTE_POSTSALE);	 //This note will be shown in chinese variant only
-   	}
-   	else
-   	{
-    	stringholder = StringLoader::LoadLC(R_QTN_DM_INFO_NOTE_UPDATING , DMSyncServerName );
-    }   
-		CAknInformationNote* informationNote = new (ELeave) CAknInformationNote ();
-		informationNote->ExecuteLD ( stringholder->Des() );
-		informationNote = NULL;
-		CleanupStack::PopAndDestroy( stringholder );	
-   }
-
-	if ( retval )
-	{
-		const TUid KUidFakeUID = { 0 };
-	  TSyncMLAppLaunchNotifRetVal pckg;
-	  pckg.iSecureId = KUidFakeUID;
-	           
-	  switch( iSmlProtocol )
-	  {
-	  	case ESyncMLSyncSession:
-	    					param.iServiceId = KDataSyncServiceStart;
-	             	break;
-	    case ESyncMLMgmtSession:
-	              param.iServiceId = KDevManServiceStart;
-								if( SanSupport == EON )
-								{													
-	              	param.iSilent = iUimode;	                    	                               
-								}
-			          pckg.iSecureId = SyncServiceL( param.iServiceId )->StartSyncL( param );
-	              break;
-	    default:
-	              // This branch should never be reached, since the option
-	              // is handled in the previous switch statement.
-	              User::Panic( KSmlNPanicCategory, KErrCorrupt );
-	              break;
-	  }	
-	                
-	  iMessage.WriteL( iReplySlot, TPckgBuf<TSyncMLAppLaunchNotifRetVal>(pckg) );
-	  iMessage.Complete( KErrNone );
-	 }
-	 else
-	 {
-	  	// Complete the message with result code indicating that
-		  // the user cancelled the query.
-	    iMessage.Complete( KErrCancel );
-	 }
-  }
-  else
-  {
-  	// Complete the message with result code indicating that
-    // the user cancelled the query.
-    iMessage.Complete( KErrCancel );
-  }
-}
-
-// -----------------------------------------------------------------------------
-// CSyncMLAppLaunchNotifier::IsLanguageSupportedL
-// Returns True if the specified language is supported.
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLAppLaunchNotifier::IsLanguageSupportedL()
-{
-	FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::IsLanguageSupportedL begins"));
-	TBool retVal(EFalse);
-	TLanguage language = User::Language();
-	if(language == ELangEnglish || language == ELangInternationalEnglish ||
- 		   language == ELangTaiwanChinese ||language == ELangHongKongChinese || language == ELangPrcChinese)
- 		   retVal = ETrue;
- 	FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::IsLanguageSupportedL ends"));
- 	return retVal;
-}
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLDlgNotifier.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1002 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Methods for the SyncML Appserver starter notifier
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <eikenv.h>             // Eikon environment
-#include <SyncMLClient.h>
-#include <SyncMLClientDS.h>
-#include <SyncMLClientDM.h>
-#include <SyncService.h>
-#include <aknnotewrappers.h>
-#include <s32mem.h> 
-#include <in_sock.h>
-#include <StringLoader.h>    // Localisation stringloader
-#include <aknlists.h>
-#include <avkon.mbg>
-#include <aknconsts.h>
-#include <utf.h>
-#include <SyncMLNotifier.rsg>   // Own resources
-#include "SyncMLDlgNotifier.h"  // Class definition
-#include "SyncMLTimedMessageQuery.h"
-#include "SyncMLAppLaunchNotifier.h"
-#include "SyncMLNotifDebug.h"
-#include "SyncMLTimedInputTextQuery.h"
-#include "SyncMLTimedDateQuery.h"
-#include "SyncMLTimedNumberQueryDialog.h"
-#include "SyncMLAknPopUplist.h"
-
-// CONSTANTS
-const TInt  KSyncMLuSecsInSec   = 1000000; // Microseconds in a second
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLDlgNotifier* CSyncMLDlgNotifier::NewL(
-    CSyncMLAppLaunchNotifier* aAppLaunchNotif )
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::NewL()") );
-    CSyncMLDlgNotifier* self = new (ELeave) CSyncMLDlgNotifier( aAppLaunchNotif );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::NewL() completed") );
-    return self;
-    }
-
-    
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CSyncMLDlgNotifier::~CSyncMLDlgNotifier()
-    {
-    Cancel();   // Free own resources
-    if(iListItems)
-        {
-        delete iListItems;
-        iListItems = NULL;
-        }
-    if(iChunk.Handle())
-        {
-        iChunk.Close();
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::EnableSyncProgressNoteL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLDlgNotifier::EnableSyncProgressNoteL( TBool aEnable )
-    {
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLDlgNotifier::EnableSyncProgressNoteL(), aEnable = %d" ),
-        aEnable ) );
-        
-    TSmlJobId currentJobId( KErrNotFound );
-    TSmlUsageType usageType;
-    TUint serviceId = 0;
-    RSyncMLSession syncSession;
-    CleanupClosePushL( syncSession );
-    
-    syncSession.OpenL();
-    syncSession.CurrentJobL( currentJobId, usageType );
-    syncSession.Close();
-    CleanupStack::Pop( &syncSession );
-
-    if ( currentJobId != KErrNotFound )
-        {
-        switch( usageType )
-            {
-            case ESmlDataSync:
-                serviceId = KDataSyncServiceStart;
-                break;
-            case ESmlDevMan:
-                serviceId = KDevManServiceStart;
-                break;
-            default:
-                User::Leave( KErrArgument );
-                break;
-            }
-
-        // There should be a valid pointer to the application launcher
-        // notifier, but we can survive without it. Therefore we'll just
-        // check for it to prevent a crash.
-        if ( iAppLaunchNotif )
-            {
-            CSyncService* syncService = iAppLaunchNotif->SyncServiceL( serviceId );
-            if ( syncService )
-                {
-                syncService->EnableProgressNoteL( aEnable );
-                }
-            }
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-    FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::EnableSyncProgressNoteL() completed") );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::RegisterL
-// -----------------------------------------------------------------------------
-//
-CSyncMLDlgNotifier::TNotifierInfo CSyncMLDlgNotifier::RegisterL()
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::RegisterL()") );
-    iInfo.iUid = KSyncMLDlgNotifierUid;
-    iInfo.iChannel = KSmlDlgChannel;
-    iInfo.iPriority = ENotifierPriorityHigh;
-    FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::RegisterL() completed") );
-    return iInfo;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::GetParamsL
-// Initialize parameters and check if device is already
-// in registry. Jump to RunL as soon as possible.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLDlgNotifier::GetParamsL( const TDesC8& aBuffer,
-                                           TInt    aReplySlot,
-                                     const RMessagePtr2& aMessage )
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::GetParamsL()") );
-    const TChar KDRSeparator('-');
-    const TChar KChoiceItemSeparator(',');
-    if ( iReplySlot != NULL || iNeedToCompleteMessage )
-        {
-        User::Leave( KErrInUse );
-        }
-    
-    if ( AutoLockOnL() )
-        {
-        // The phone is locked, access denied.
-        // Write results back to caller and complete message.
-        aMessage.Complete( KErrLocked );
-        iNeedToCompleteMessage = EFalse;
-        return;
-        }
-
-    iMessage = aMessage;
-    iNeedToCompleteMessage = ETrue;
-    iReplySlot = aReplySlot;
-
-    TSyncMLDlgNotifParams param;
-    TPckgC<TSyncMLDlgNotifParams> pckg( param );
-    pckg.Set( aBuffer );
-    iNoteType = pckg().iNoteType;
-    iServerMsg.Copy( pckg().iServerMsg.Left( KSyncMLMaxServerMsgLength ) );
-    iMaxTime = pckg().iMaxTime;
-    iMaxlen = pckg().iMaxLength;
-    //check for iDR is there are not
-    iDR.Copy( pckg().iDR.Left( KSyncMLMaxDefaultResponseMsgLength ) );
-    iIT = pckg().iIT;
-    iET = pckg().iET;
-    //verification of other params as like maxtime
-    if ( iMaxlen <= 0 || iMaxlen >KSyncMLMaxDefaultResponseMsgLength )
-        {
-        iMaxlen = KSyncMLMaxDefaultResponseMsgLength;
-        }
-
-    if ( iIT < ESyncMLInputTypeAlphaNumeric || iIT > ESyncMLInputTypeIPAddress )
-        {
-        iIT = ESyncMLInputTypeAlphaNumeric;
-        }
-
-    if ( iET < ESyncMLEchoTypeText || iET > ESyncMLEchoTypePassword )
-        {
-        iET = ESyncMLEchoTypeText;
-        }
-
-    if( iServerMsg.Length() == 0 )
-        {
-        HBufC* stringholder = NULL;
-        stringholder = StringLoader::LoadLC( R_DEFAULT_ALERT_HEADING );
-        iServerMsg.Copy( stringholder->Des() );
-        CleanupStack::PopAndDestroy( stringholder );
-        }
-    if ( iMaxTime < 0 )
-        {
-        iMaxTime = 0;
-        }
-    if (iNoteType == ESyncMLSingleChoiceQuery || iNoteType == ESyncMLMultiChoiceQuery )
-        {
-		iNumberOfItems = pckg().iNumberOfItems;  		
-        if(iNumberOfItems > 0)
-            {            
-            iListItems = new (ELeave) CDesCArrayFlat( iNumberOfItems );
-            }
-		else
-			{
-		    aMessage.Complete( KErrCancel );
-			iNeedToCompleteMessage = EFalse;
-			return;
-			}
-        TPtrC8 listitemsptr;
-        TBuf<KSyncMLChoiceItemsLengthBuffer> listlengtharray;                
-        User::LeaveIfError(iChunk.OpenGlobal(pckg().iChunkName,EFalse));
-        TInt size1 = iChunk.Size();
-        listitemsptr.Set(iChunk.Base(),size1);        
-        HBufC* databuf = NULL;
-        TRAPD(errC, databuf = CnvUtfConverter::ConvertToUnicodeFromUtf8L(listitemsptr));
-        iChunk.Close();
-        if(errC)
-            {
-            aMessage.Complete( errC );
-            iNeedToCompleteMessage = EFalse;
-            return;
-            }
-        CleanupStack::PushL(databuf);
-        TPtr listitems = databuf->Des();                       		
-        listlengtharray=pckg().iItemLength;      
-        TPtrC temp1,temp2,temp3,temp4;        
-        TInt currlen=0,itemlength=0;
-        TInt prevcommapos=0;
-        TBuf<4> checkon(_L("0\t"));
-        TBuf<4> checkoff(_L("1\t"));        
-        for(TInt i=0;i<listlengtharray.Length();i++)
-            {            
-            if(listlengtharray[i]== KChoiceItemSeparator )
-                {
-                if(prevcommapos)
-                    {
-                    temp1.Set(listlengtharray.LeftTPtr(i));
-                    temp2.Set(temp1.Right(i-(prevcommapos+1)));
-                    prevcommapos=  i;
-                    }
-                else //firsttime finding comma
-                    {
-                    prevcommapos=  i;
-                    temp1.Set(listlengtharray.LeftTPtr(i));
-                    temp2.Set(temp1.Right(i));
-                    }                
-                TLex lexval;
-                lexval.Assign(temp2);
-                lexval.Val(itemlength);                
-                temp3.Set(listitems.Left(currlen + itemlength));
-                temp4.Set(temp3.Right(itemlength));
-                currlen += itemlength;                
-                HBufC* item1 = HBufC::NewLC(temp4.Length()+3);
-                if(iNoteType == ESyncMLMultiChoiceQuery)
-                    {
-                    item1->Des().Append(checkoff);//by default dont show check on                                     
-                    }                
-                item1->Des().Append(temp4);
-                iListItems->AppendL(item1->Des());
-                CleanupStack::PopAndDestroy(1);//item,dataBuf16                
-                }
-            }
-        CleanupStack::PopAndDestroy(1);
-        }   
-    SetActive();
-    iStatus = KRequestPending;
-    TRequestStatus* stat = &iStatus;
-    User::RequestComplete( stat, KErrNone );
-
-    FTRACE( FPrint( _L(
-            "[SmlNotif]\t CSyncMLDlgNotifier::GetParamsL() completed, iNoteType = %d, iTimeout = %d, iServerMsg = " ),
-            iNoteType, iMaxTime ) );
-    FTRACE( FPrint( _L(
-            "[SmlNotif]\t \"%S\"" ),
-            &iServerMsg ) );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::Cancel
-// -----------------------------------------------------------------------------
-//
-void CSyncMLDlgNotifier::Cancel()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLDlgNotifier::Cancel()"));
-
-    CSyncMLNotifierBase::Cancel();
-
-    FLOG(_L("[SmlNotif]\t CSyncMLDlgNotifier::Cancel() completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::RunL
-// Ask user response and return it to caller.
-// Store device into registry if user has accepted authorisation.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLDlgNotifier::RunL()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLDlgNotifier::RunL()"));
-    const TChar KDRSeparator('-');
-    const TChar KChoiceItemSeparator(',');
-    TInt result( KErrNone );
- 		EndKeyPress = EFalse;
-    // Turn lights on and deactivate apps -key
-    //
-    TurnLightsOn();  
-
-    switch( iNoteType )
-        {
-        case ESyncMLInfoNote:
-            {
-            CAknInformationNote* infoNote = new (ELeave) CAknInformationNote;
-            TInt maxtime = iMaxTime * KSyncMLuSecsInSec;
-            if ( maxtime < 0  )
-                {
-                maxtime = 0;
-                }
-            infoNote->SetTimeout( (CAknNoteDialog::TTimeout) maxtime );
-            result = infoNote->ExecuteLD( iServerMsg );
-            if ( result == KErrNone )
-                {
-                result = EAknSoftkeyOk;
-                }
-            break;
-            }
-        case ESyncMLErrorNote:
-            {
-            CAknErrorNote* errNote = new (ELeave) CAknErrorNote;
-            TInt maxtime = iMaxTime * KSyncMLuSecsInSec;
-            if ( maxtime < 0  )
-                {
-                maxtime = 0;
-                }
-            errNote->SetTimeout( (CAknNoteDialog::TTimeout) maxtime );
-            result = errNote->ExecuteLD( iServerMsg );
-            if ( result == KErrNone )
-                {
-                result = EAknSoftkeyOk;
-                };
-            break;
-            }
-        case ESyncMLOkQuery:
-            {
-            FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() Ok/Empty query shown") );
-            
-            CSyncMLTimedMessageQuery* dlg =
-                CSyncMLTimedMessageQuery::NewL( iServerMsg, iMaxTime );
-            
-            // Pushed dialog is popped inside RunLD
-            dlg->PrepareLC( R_SML_MESSAGE_QUERY );
-            	dlg->ButtonGroupContainer().SetCommandSetL( 
-                                        R_AVKON_SOFTKEYS_OK_EMPTY__OK );
-            EnableSyncProgressNoteL( EFalse );
-            result = dlg->RunLD();
-            dlg = NULL;
-            EnableSyncProgressNoteL( ETrue );
-            break;
-            }
-            
-        case ESyncMLQueryNote:  // This enumeration will be removed.
-        case ESyncMLYesNoQuery:
-            {
-            FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() Yes/No query shown") );
-            CSyncMLTimedMessageQuery* dlg = 
-            CSyncMLTimedMessageQuery::NewL( iServerMsg, iMaxTime );
-            // Pushed dialog is popped inside RunLD
-            dlg->PrepareLC( R_SML_MESSAGE_QUERY );
-            dlg->ButtonGroupContainer().SetCommandSetL( 
-                    R_AVKON_SOFTKEYS_YES_NO__YES );
-            EnableSyncProgressNoteL( EFalse );
-            result = dlg->RunLD();
-            dlg = NULL;
-            EnableSyncProgressNoteL( ETrue );
-            break;
-            }
-        case ESyncMLSingleChoiceQuery:
-            {
-			FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() single choice list query") );             
-            if ( iNumberOfItems > 0 )
-                {
-                SuppressAppSwitching( ETrue );
-                EnableSyncProgressNoteL( EFalse );
-                CEikFormattedCellListBox* listBox = new ( ELeave )
-                CAknSinglePopupMenuStyleListBox;
-                CleanupStack::PushL( listBox );
-                CSyncMLAknPopUpList* popupList = 
-                CSyncMLAknPopUpList::NewL( (CAknSingleHeadingPopupMenuStyleListBox*)listBox, 
-                            R_AVKON_SOFTKEYS_OK_CANCEL__OK,
-                            AknPopupLayouts::EMenuWindow,iMaxTime );
-                CleanupStack::PushL( popupList );
-                listBox->ConstructL( popupList, ( EAknListBoxSelectionList | EAknListBoxLoopScrolling ) );
-                listBox->Model()->SetItemTextArray( iListItems );
-                listBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-                listBox->ItemDrawer()->FormattedCellData()->EnableMarqueeL( ETrue );
-                listBox->HandleItemAdditionL();
-                listBox->CreateScrollBarFrameL( ETrue );
-                listBox->ScrollBarFrame()->SetScrollBarVisibilityL(
-                        CEikScrollBarFrame::EOff, CEikScrollBarFrame::EAuto);
-                TInt defaultindex = 0;
-                TLex drval(iDR);                    
-                drval.Val(defaultindex);
-                if(defaultindex > 0)
-                    defaultindex--;
-                else
-                    defaultindex = 0;
-                listBox->SetCurrentItemIndex(defaultindex);                                   
-                popupList->SetTitleL( iServerMsg );
-                CleanupStack::Pop( popupList );
-				FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() single choice list query shown") ); 
-                result = popupList->ExecuteLD();
-				FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() single choice list query dismissed") ); 
-                popupList = NULL;
-                if ( result )
-                    {
-                    reply.irettext.Num(listBox->CurrentItemIndex()+1);
-                    }
-                reply.iretval = result;                
-                CleanupStack::PopAndDestroy( listBox );  // Destroys also the icon array
-                EnableSyncProgressNoteL( ETrue );
-                SuppressAppSwitching( EFalse );
-                }
-				else
-				{
-				reply.iretval = result;				
-				}
-				TSyncMLDlgNotifReturnParamsPckg pkg(reply);
-                iMessage.WriteL(iReplySlot,pkg);
-            break;
-            }
-        case ESyncMLMultiChoiceQuery:
-            {           
-            if ( iNumberOfItems > 0 )
-                {
-				SuppressAppSwitching( ETrue );
-                EnableSyncProgressNoteL( EFalse );
-                // create listbox
-                // list item string format: "0\tLabel" where 0 is an index to icon array
-                CEikFormattedCellListBox* listBox =
-                new ( ELeave ) CAknSingleGraphicPopupMenuStyleListBox;
-                CleanupStack::PushL( listBox );
-                // create popup
-                CSyncMLAknPopUpList* popup = 
-                CSyncMLAknPopUpList::NewL((CAknSingleHeadingPopupMenuStyleListBox*) listBox,
-                            R_AVKON_SOFTKEYS_OK_CANCEL__MARK ,
-                            AknPopupLayouts::EMenuWindow,iMaxTime);
-                CleanupStack::PushL( popup );
-                popup->SetTitleL(iServerMsg );
-#ifdef RD_SCALABLE_UI_V2
-                if( AknLayoutUtils::PenEnabled() )
-                    {
-                    listBox->ConstructL( popup, EAknListBoxStylusMultiselectionList );
-                    }
-                else
-                    {
-                    listBox->ConstructL( popup, EAknListBoxMultiselectionList );
-                    }
-#else
-                listBox->ConstructL( popup, EAknListBoxMultiselectionList );
-#endif
-                listBox->CreateScrollBarFrameL(ETrue);
-                listBox->ScrollBarFrame()->
-                SetScrollBarVisibilityL(
-                        CEikScrollBarFrame::EOff, CEikScrollBarFrame::EAuto );                
-                SetIconsL(listBox);
-                listBox->Model()->SetItemTextArray( iListItems );
-                listBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-                listBox->SetCurrentItemIndex(iDefindex);  
-                listBox->ItemDrawer()->FormattedCellData()->EnableMarqueeL( ETrue );                
-                listBox->HandleItemAdditionL();
-                // set all items as selected
-                TInt count( listBox->Model()->NumberOfItems() );                
-                TBuf<20> drcheck;
-                for( TInt index( 0 ); index < count; index++ )
-                    {
-                    drcheck.Zero();
-                    drcheck.Append(KDRSeparator);
-                    drcheck.AppendNum(index+1);
-                    drcheck.Append(KDRSeparator);
-                    if(iDR.Find(drcheck) >= KErrNone)
-                        {
-                        listBox->View()->SelectItemL( index );
-                        }                                                            
-                    }              
-                // launch popup
-                result = popup->ExecuteLD();
-                // No leaving functions allowed between executeLD and CleanupStack::Pop().
-                CleanupStack::Pop( popup );                
-                /// Own: ListBox selection array
-                const CArrayFix<TInt>* iSelectionArray;                
-                if( result )
-                    {
-                    iSelectionArray = listBox->View()->SelectionIndexes();
-                    TBuf<20> temp;
-                    TBuf<KSyncMLMaxAlertResultLength> temp1;
-                    for(TInt i=iSelectionArray->Count()-1;i>=0;i--)
-                        {
-                        temp.Num(iSelectionArray->At(i)+1);
-                        if((temp1.Length() + temp.Length()) < KSyncMLMaxAlertResultLength )
-                            {
-                            temp1.Append(temp);
-                            temp1.Append(KDRSeparator);                            
-                            }
-                        else{
-                            break;
-                            }
-                        } 
-                    reply.irettext.Append(temp1);                    
-                    // delete iSelectionArray; this deletion taken care in ~CEIKLISTBOX (eiklbx.cpp)
-                    }
-                reply.iretval = result;
-                CleanupStack::PopAndDestroy(); // listBox                
-				EnableSyncProgressNoteL( ETrue );
-                SuppressAppSwitching( EFalse );					
-                }
-				else
-				{
-				reply.iretval = result;				
-				}
-				TSyncMLDlgNotifReturnParamsPckg pkg(reply);
-                iMessage.WriteL(iReplySlot,pkg);                                          
-            break;
-            }
-        case ESyncMLInputQuery: //For 1102 alert
-            {   
-            FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() Input query shown") ); 
-            // For input text server alert
-              
-            SuppressAppSwitching( ETrue );
-
-             switch( iIT )   
-             {
-             	case ESyncMLInputTypeAlphaNumeric: //Alphanumeric Input type
-             	    {
-             	     
-          				InputTypeAlphaNumericL(result);
-             	     break;
-             	    }
-             	    	
-             	case ESyncMLInputTypeNumeric: //Numeric Input type
-             		{
-             		InputTypeNumericL(result);
-             		break;
-             		}	
-             		
-             	case ESyncMLInputTypeDate: //Date Input type
-             	    {
-								InputTypeDateL(result);
-             	    break;
-             	    }		
-             			
-             	case ESyncMLInputTypeTime: //Time Input type
-             		{//create TTime from TBuf iDR
-             		//hhmmss
-								InputTypeTimeL(result);
-             		break;	
-             		}
-             		
-             	case ESyncMLInputTypePhoneNumber: //Phone Number Input type
-             		{
-								InputTypePhoneNumberL(result);
-             		break;
-             		}	
-             		
-             	case ESyncMLInputTypeIPAddress: //IP Address Input type
-             	    {			
-             	    	TBuf<KSyncMLMaxDefaultResponseMsgLength> InputText(iDR);
-                	TInetAddr destAddr;
-					destAddr.Input(iDR);					
-					EnableSyncProgressNoteL( EFalse );//coment out when using test app
-					CAknIpAddressQueryDialog* dlg = CAknIpAddressQueryDialog::NewL (destAddr); 
-					CleanupStack::PushL(dlg);
-					dlg->SetPromptL(iServerMsg);
-					CleanupStack::Pop(); //dlg
-					result=dlg->ExecuteLD( R_NEWALERT_IP_QUERY );
-					dlg=NULL;
-					destAddr.Output(InputText);				
-					reply.iretval = result;
-					reply.irettext=InputText;					
-             		EnableSyncProgressNoteL( ETrue );//coment out when using test app	
-             	    break;
-             	    }
-             			
-                default: 
-                    {
-                    	User::Leave( KErrArgument );
-                    }			
-             }
-             SuppressAppSwitching( EFalse );
-             TSyncMLDlgNotifReturnParamsPckg pkg(reply);
-             iMessage.WriteL(iReplySlot,pkg);
-             break;
-            }
-//#endif
-            
-        default: // Unhandled note type
-            {
-            FLOG(_L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() Note type not handled"));
-            User::Leave( KErrArgument );
-            break;
-            }
-        }
-    // Complete message, if not cancelled
-    if ( iNeedToCompleteMessage )
-        {
-		 FLOG(_L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() completing the message"));
-        switch ( result )
-            {
-            case EAknSoftkeyYes:
-            case EAknSoftkeyOk:
-            case ETrue:    
-                {
-				FLOG(_L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() completing the message with KErrNone"));
-                iMessage.Complete( KErrNone );
-                break;
-                }
-            case EAknSoftkeyCancel:
-            case EAknSoftkeyNo:
-            case KErrNone:  // Pressing "Cancel" or "No" may return zero
-                {
-				FLOG(_L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() completing the message with KErrCancel"));
-                iMessage.Complete( KErrCancel );
-                break;
-                }
-            default:
-                {
-                iMessage.Complete( result );
-                break;
-                }
-            }
-        }
-
-    iNeedToCompleteMessage = EFalse;
-    iReplySlot = NULL;
-
-    iServerMsg = KNullDesC;
-
-    FLOG(_L("[SmlNotif]\t CSyncMLDlgNotifier::RunL() completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::CSyncMLDlgNotifier
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLDlgNotifier::CSyncMLDlgNotifier( CSyncMLAppLaunchNotifier* aAppLaunchNotif )
-    : iAppLaunchNotif( aAppLaunchNotif ),iListItems(NULL),iDefindex(0)
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::InputTypeAlphaNumericL(TInt & result) 
-// Process if input type is alphanumeric
-// -----------------------------------------------------------------------------
-//    
-void CSyncMLDlgNotifier::InputTypeAlphaNumericL(TInt & result)    
-{
-		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeAlphaNumericL() startedd") );
-		TBuf<KSyncMLMaxDefaultResponseMsgLength> InputText(iDR);
-		if( iET == ESyncMLEchoTypePassword ) //for pwd ET
-    {
-    		CSyncMLTimedInputTextQuery* dlg = CSyncMLTimedInputTextQuery::NewL( InputText, iServerMsg, EndKeyPress, iMaxTime);
-				dlg->SetMaxLength( iMaxlen );
-				EnableSyncProgressNoteL( EFalse );//coment out when using test app
-				result = dlg->ExecuteLD( R_NEWALERT_DATA_PWD_QUERY );
-				if(EndKeyPress)
-				{
-					 result = KErrAbort;	
-				}
-				reply.iretval = result;
-				reply.irettext=InputText;
-				dlg=NULL;
-				EnableSyncProgressNoteL( ETrue );//coment out when using test app
-    }
-    else
-    {
-        CSyncMLTimedInputTextQuery* dlg = CSyncMLTimedInputTextQuery::NewL( InputText,iServerMsg, EndKeyPress, iMaxTime);
-				dlg->SetMaxLength( iMaxlen );
-				EnableSyncProgressNoteL( EFalse );//coment out when using test app
-				result = dlg->ExecuteLD( R_INPUTTEXT_DATA_QUERY );
-				if(EndKeyPress )
-				{					 					 
-					 result = KErrAbort;
-        }
-				reply.iretval = result;
-				reply.irettext=InputText;
-				dlg=NULL;
-				EnableSyncProgressNoteL( ETrue );//coment out when using test app		
-    }
-    FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeAlphaNumericL() completed") );
-}
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::InputTypeNumericL(TInt & result) 
-// Process if input type is numeric
-// -----------------------------------------------------------------------------
-//    
-void CSyncMLDlgNotifier::InputTypeNumericL(TInt & result)
-{
-		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeNumericL() started") ); 
-		TBuf<KSyncMLMaxDefaultResponseMsgLength> InputText(iDR);
-	  TReal value = 0;
-    TLex data(iDR);
-    if( iDR.Length() != 0 )
-    {
-    		data.Val(value);
-    }
-    if ( iET == ESyncMLEchoTypePassword )
-    {
-    		TChar ch = '0';
-        for (TInt i=0;i<iDR.Length();i++)
-        {
-        		ch=iDR[i];
-            if( ch!='+' || ch!='-' || ch!='.' )
-            {
-            		if( !ch.IsDigit() )
-             	  {
-             	  		InputText.Zero();
-             	    	break;	
-             	  }
-            }
-        }
-        CSyncMLTimedInputTextQuery* dlg = CSyncMLTimedInputTextQuery::NewL( InputText, iServerMsg, EndKeyPress, iMaxTime);
-				dlg->SetMaxLength( iMaxlen );
-				EnableSyncProgressNoteL( EFalse );//coment out when using test app
-				result = dlg->ExecuteLD( R_NEWALERT_NUMERIC_PWD_QUERY );
-				dlg = NULL;
-				if(EndKeyPress)
-				{
-					 result = KErrAbort;	
-				}
-		}
-    else
-    {
-    		CSyncMLTimedNumberQueryDialog* dlg =
-				CSyncMLTimedNumberQueryDialog::NewL( value, iServerMsg, EndKeyPress,  iMaxTime);
-				    
-				EnableSyncProgressNoteL( EFalse );//coment out when using test app
-				result = dlg->ExecuteLD( R_NEWALERT_NUMBER_QUERY );
-				dlg = NULL;
-				if(EndKeyPress)
-				{
-					result = KErrAbort;	
-				}
-				reply.iretval = result;
-				data.Val( value );
-				_LIT(KSendFormat ,"%10.10f");
-				InputText.Format ( KSendFormat, value );
-		}
-		reply.iretval = result;
-		reply.irettext= InputText;
-								 
-		EnableSyncProgressNoteL( ETrue );//coment out when using test app  
-		
-		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeNumericL() completed") );    		
-}
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::InputTypeDateL(TInt & result) 
-// Process if input type is Date
-// -----------------------------------------------------------------------------
-//  
-void CSyncMLDlgNotifier::InputTypeDateL(TInt & result)
-{
-		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeDateL() started") ); 
-		
-	  TTime date(_L("00010101:"));
-    TInt BadData = 1;
-    TChar ch = '0';
-    for (TInt i=0;i<iDR.Length();i++)
-    {
-    		ch=iDR[i];
-        if(!ch.IsDigit())
-        {
-        		BadData=0;
-            break;
-        }
-    }
-    if( iDR.Length() != 0 && iDR.Length()==8 && BadData )
-    {
-    		//iDR.Append(':');
-        TBuf <9> revdate;
-				revdate.Append(iDR.Mid(4,4));
-				revdate.Append(iDR.Mid(2,2));
-				revdate.Append(iDR.Left(2));
-				revdate.Append(':');
-        date.Set( revdate );
-    }
-		CSyncMLTimedDateQuery* dlg = CSyncMLTimedDateQuery::NewL( date, iServerMsg,EndKeyPress ,  iMaxTime);
-		EnableSyncProgressNoteL( EFalse );//coment out when using test app
-		result = dlg->ExecuteLD(R_NEWALERT_DATE_QUERY); 
-					
-		if(EndKeyPress)
-		{
-				result = KErrAbort;//0-keypress 1-ok,0-cancel,-1=end key	
-		}
-		reply.iretval = result;
-		_LIT(KDateFormat,"%F%D%M%Y");
-		TBuf <20> StringDate;					
-		date.FormatL(StringDate, KDateFormat);
-		reply.irettext=StringDate;
-		dlg = NULL;
-		EnableSyncProgressNoteL( ETrue );//comented out for emulator testing
-		
-		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeDateL() completed") );            
-}		
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::InputTypeTimeL(TInt & result) 
-// Process if input type is Time
-// -----------------------------------------------------------------------------
-//             	    
-void CSyncMLDlgNotifier::InputTypeTimeL(TInt & result)
-{            	
-		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeTimeL() started") );
-		
-    //create TTime from TBuf iDR
-    //hhmmss
-    TTime IpTime(_L("120000."));
-    TInt BadData=1;
-    TChar ch= '0';
-    for (TInt i=0;i<iDR.Length();i++)
-    {
-    		ch=iDR[i];
-        if(!ch.IsDigit())
-        {
-        		BadData=0;
-            break;
-        }
-    }
-    if( iDR.Length() != 0 && iDR.Length() == 6 && BadData )
-    {
-    		iDR.Append('.');
-        IpTime.Set( iDR );
-    }	             	
-		CSyncMLTimedDateQuery* dlg =
-		CSyncMLTimedDateQuery::NewL( IpTime, iServerMsg, EndKeyPress, iMaxTime);					
-		EnableSyncProgressNoteL( EFalse );//comented out for emulator testing
-		result = dlg->ExecuteLD(R_NEWALERT_TIME_QUERY);					
-		if(EndKeyPress)
-		{
-				result = KErrAbort;//0-keypress 1-ok,0-cancel,-1=end key	
-		}
-		reply.iretval = result;				
-		_LIT(KTimeFormat,"%F%H%T%S");
-		TBuf <20> StringTime;				
-		IpTime.FormatL(StringTime, KTimeFormat);
-		reply.irettext=StringTime;				
-		dlg = NULL;  
-		EnableSyncProgressNoteL( ETrue );//coment out when using test app
-		
-		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypeTimeL() completed") );
-}
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::InputTypePhoneNumberL(TInt & result) 
-// Process if input type is Phone number
-// -----------------------------------------------------------------------------
-//  
-void CSyncMLDlgNotifier::InputTypePhoneNumberL(TInt & result)
-{
-		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypePhoneNumberL() started") );
-		TBuf<KSyncMLMaxDefaultResponseMsgLength> InputText(iDR);
-		EnableSyncProgressNoteL( EFalse );//comented out for emulator testing
-		TInt ret=0;
-		for(TInt i=0;i<iDR.Length();i++)
-		{
-				if(iDR[i] == 'p' || iDR[i] == 'w' || iDR[i] == '+' || iDR[i] == '*' ||iDR[i] == '#')
-				{
-						if( iDR[i] == '+' && i > 0)
-					 	{
-					 			ret = -1;
-					 			break;
-					 	}
-					 	else
-					 {
-							continue;
-					 }
-				}
-				else
-				{
-						TChar ch=iDR[i] ;
-			 			if(!ch.IsDigit())
-			 			{
-			  				ret = -1;
-			 					break;	
-			 			}
-				}
-		}
-				
-		if(ret == -1)
-		InputText.Zero();
-		CSyncMLTimedInputTextQuery* dlg = CSyncMLTimedInputTextQuery::NewL(InputText,iServerMsg, EndKeyPress, iMaxTime);					
-		dlg->SetMaxLength( iMaxlen );					 
-		result = dlg->ExecuteLD( R_NEWALERT_PHONE_QUERY );
-		if(EndKeyPress )
-		{
-					result = KErrAbort;
-		}
-		reply.iretval = result;					
-		reply.irettext=InputText;
-		dlg=NULL;					
-		EnableSyncProgressNoteL( ETrue );//coment out when using test app 
-		FLOG( _L("[SmlNotif]\t CSyncMLDlgNotifier::InputTypePhoneNumberL() completed") );
-}
-
-// -----------------------------------------------------------------------------
-// CSyncMLDlgNotifier::SetIconsL() 
-// Sets the icons to multiselection/markable list
-// -----------------------------------------------------------------------------
-void CSyncMLDlgNotifier::SetIconsL(CEikFormattedCellListBox* aListBox)
-    {        
-    CAknIconArray* iconArray = new( ELeave ) CAknIconArray( 1 );
-        CleanupStack::PushL( iconArray );
-        CFbsBitmap* checkboxOnBitmap = NULL;
-        CFbsBitmap* checkboxOnBitmapMask = NULL;
-        CFbsBitmap* checkboxOffBitmap = NULL;
-        CFbsBitmap* checkboxOffBitmapMask = NULL;
-
-        //CListItemDrawer is using this logical color as default for its marked icons
-        TRgb defaultColor;
-        defaultColor = iEikEnv->Color( EColorControlText );
-
-        // Create 'ON' checkbox icon
-        AknsUtils::CreateColorIconLC( AknsUtils::SkinInstance(),
-                    KAknsIIDQgnIndiCheckboxOn,
-                    KAknsIIDQsnIconColors,
-                    EAknsCIQsnIconColorsCG13,
-                    checkboxOnBitmap,
-                    checkboxOnBitmapMask,
-                    KAvkonBitmapFile,
-                    EMbmAvkonQgn_indi_checkbox_on,
-                    EMbmAvkonQgn_indi_checkbox_on_mask,
-                    defaultColor
-                    );
-
-        CGulIcon* checkboxOnIcon = CGulIcon::NewL( checkboxOnBitmap, checkboxOnBitmapMask );
-        // cleanup checkboxOnBitmap, checkboxOnBitmapMask
-        CleanupStack::Pop( checkboxOnBitmapMask );
-        CleanupStack::Pop( checkboxOnBitmap ); 
-
-        CleanupStack::PushL( checkboxOnIcon );
-        iconArray->AppendL( checkboxOnIcon );
-
-        // Create 'OFF' checkbox icon
-        AknsUtils::CreateColorIconLC( AknsUtils::SkinInstance(),
-                    KAknsIIDQgnIndiCheckboxOff,
-                    KAknsIIDQsnIconColors,
-                    EAknsCIQsnIconColorsCG13,
-                    checkboxOffBitmap,
-                    checkboxOffBitmapMask,
-                    KAvkonBitmapFile,
-                    EMbmAvkonQgn_indi_checkbox_off,
-                    EMbmAvkonQgn_indi_checkbox_off_mask,
-                    defaultColor
-                    );
-
-        CGulIcon* checkboxOffIcon = CGulIcon::NewL( checkboxOffBitmap, checkboxOffBitmapMask );
-        // cleanup checkboxOffBitmap, checkboxOffBitmapMask
-        CleanupStack::Pop( checkboxOffBitmapMask ); //WILL BE DELETED BY CGUIICON
-        CleanupStack::Pop( checkboxOffBitmap ); //WILL BE DELETED BY CGUIICON
-        
-
-        CleanupStack::PushL( checkboxOffIcon );
-        iconArray->AppendL( checkboxOffIcon );
-        aListBox->ItemDrawer()->ColumnData()->SetIconArray( iconArray ); // changes ownership
-        
-        // cleanup checkboxOnIcon, checkboxOffIcon, iconArray
-        CleanupStack::Pop( checkboxOffIcon ); //WILL BE DELETED BY CGUIICON
-        CleanupStack::Pop( checkboxOnIcon ); //WILL BE DELETED BY CGUIICON
-        CleanupStack::Pop( iconArray );//WILL BE DELETED BY CFormattedCellListBoxData::
-
-    }
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLFwUpdNotifier.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1000 +0,0 @@
-/*
-* Copyright (c) 2005-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:  The firmware update result notifier.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <eikenv.h>          // Eikon environment
-#include <uikon/eiksrvui.h>
-#include <AknQueryDialog.h>
-#include <aknmessagequerydialog.h>
-#include <aknstaticnotedialog.h>
-#include <centralrepository.h>  
-#include <StringLoader.h>    // Localisation stringloader
-#include <SyncMLClient.h>
-#include <SyncMLClientDS.h>
-#include <SyncMLClientDM.h>
-#include <centralrepository.h>
-#include <DevManInternalCRKeys.h>   
-#include <SyncMLNotifierDomainCRKeys.h> 
-#include <SyncMLNotifier.rsg>           // Own resources
-#include <aknnotewrappers.h>
-#include <e32property.h>
-
-#include "SyncMLFwUpdNotifier.h"  // Class declaration
-#include "SyncMLNotifDebug.h"
-
-#include "SyncMLQueryDialog.h"
-#include "SyncMLMessageQueryDialog.h"
-#include "SyncMLNotifPrivateCRKeys.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::CSyncMLFwUpdNotifier
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLFwUpdNotifier::CSyncMLFwUpdNotifier()
-    {
-    iRunLhang = EFalse;
-    iDlg = NULL;
-    iFotaEncryptReq = EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLDSNotifier::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLFwUpdNotifier* CSyncMLFwUpdNotifier::NewL()
-    {
-    CSyncMLFwUpdNotifier* self = new (ELeave) CSyncMLFwUpdNotifier();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-    return self;
-    }
-
-    
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CSyncMLFwUpdNotifier::~CSyncMLFwUpdNotifier()
-    {
-    Cancel();   // Free own resources
-    }
-
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::RegisterL
-// -----------------------------------------------------------------------------
-//
-CSyncMLFwUpdNotifier::TNotifierInfo CSyncMLFwUpdNotifier::RegisterL()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::RegisterL()"));
-    iInfo.iUid = KSyncMLFwUpdNotifierUid;
-    iInfo.iChannel = KSmlFwUpdChannel;
-    iInfo.iPriority = ENotifierPriorityHigh;
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::RegisterL() completed"));
-    return iInfo;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::GetParamsL
-// Initialize parameters and check if device is already
-// in registry. Jump to RunL as soon as possible.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLFwUpdNotifier::GetParamsL( const TDesC8& aBuffer,
-                                             TInt aReplySlot,
-                                       const RMessagePtr2& aMessage )
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::GetParamsL()"));
-
-    if( iReplySlot != NULL || iNeedToCompleteMessage )
-        {
-        User::Leave( KErrInUse );
-        }
-    iMessage = aMessage;
-    iNeedToCompleteMessage = ETrue;
-    iReplySlot = aReplySlot;
-
-	TSyncMLFwUpdNotifParams param;
- 	TPckgC<TSyncMLFwUpdNotifParams> pckg( param );
- 	pckg.Set( aBuffer );
-
-    iNoteType = pckg().iNoteType;
-    iNoteInfo = pckg().iIntParam;
-    iFotaMemoryNeeded = pckg().iMemoryNeeded;
-    iFotaEncryptReq = pckg().iEncryptReq;
-
-    // Call SetActive() so RunL() will be called by the active scheduler
-    //
-    SetActive();
-    iStatus = KRequestPending;
-    TRequestStatus* stat = &iStatus;
-    User::RequestComplete( stat, KErrNone );
-
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::GetParamsL() completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::RunL
-// Ask user response and return it to caller.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLFwUpdNotifier::RunL()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::RunL()"));
-
-    TInt result( KErrNone );
-
-    // Turn lights on and deactivate apps -key
-    //
-    TurnLightsOn();
-    SuppressAppSwitching( ETrue );
-
-    switch( iNoteType )
-        {
-        case ESyncMLFwUpdErrorNote:
-            {
-            result = ShowUpdateErrorNoteL();
-            break;
-            }
-
-        case ESyncMLFwUpdResultNote:
-            {
-            if (iFotaEncryptReq)
-                {
-                result = ShowUpdateResultWithEncryptionNoteL();
-                }
-            else
-                {
-                result = ShowUpdateResultNoteL();
-                }
-            break;
-            }
-            
-        case ESyncMLFwUpdStartQuery:
-            {
-            result = ShowUpdateStartQueryL();
-            break;
-            }
-        case ESyncMLFwUpdRebootNote:
-            {
-            CAknStaticNoteDialog* dlg = new ( ELeave ) CAknStaticNoteDialog;
-            dlg->PrepareLC( R_SML_FOTA_RESTART_NOTE );
-
-            HBufC* stringHolder = StringLoader::LoadLC( R_FOTA_REBOOT_NOTE );
-            dlg->SetTextL( *stringHolder );
-            CleanupStack::PopAndDestroy( stringHolder );
-
-            result = dlg->RunLD();
-            if ( result == KErrNone )
-                {
-                result = EAknSoftkeyOk;
-                };
-            
-            break;
-            }
-     	case ESyncMLFwUpdNoReminder:
-     		{
-     		 result =  ShowNoReminderQueryL();
-			 break;
-            }
-        case ESyncMLFwUpdLargeNotEnoughMemory:
-        	{
-        	 result = ShowNotEnoughMemoryL( iFotaMemoryNeeded , EFalse );
-			 break;
-        	}
-        case ESyncMLFwUpdOmaDLNotEnoughMemory:
-        	{
-        	 result = ShowNotEnoughMemoryL( iFotaMemoryNeeded , ETrue );
-			 break;
-        	}	
-        case ESyncMLFwUpdOmaDLUserCancel:
-        	{
-        	 result = ShowDownloadUserCancelL();
-        	 break;	
-        	}
-        case ESyncMLFwUpdOmaDLPostponed:
-        	{
-        	 result = ShowDownloadPostponedL();
-        	 break;	
-        	}
-        case ESyncMLFwUpdOmaDLCancelled:
-        	{
-        	 result = ShowDownloadCancelledL();
-        	 break;	
-        	}
-        case ESyncMLFwUpdOmaDLResume:
-        	{
-        	 result = ShowDownloadResumeL();
-        	 break;	
-        	}
-        case ESyncMLFwUpdStartQueryEnc:
-            {
-            result = ShowUpdateStartQueryEncryptionL();
-            break;
-            }
-        default: // Unhandled note type
-            {
-            FLOG(_L("[SMLNOTIF]\t CSyncMLDlgNotifier::RunL() Note type not handled"));
-            User::Leave( KErrArgument );
-            break;
-            }
-        }
-
-    // Activate apps -key again
-    //
-    SuppressAppSwitching( EFalse );
-
-		if ( iNeedToCompleteMessage )
-			{
-			// Translate the user key presses to message completion response
-			FTRACE( FPrint( _L("[SmlNotif]\t User Key-Press for dialog = %d" ), result ) );
-			switch( result ) 
-				{
-					case ESyncMLDlgRespKeyOk://all LSK press will fall here.
-						iMessage.Complete( KErrNone );
-						break;
-					case ESyncMLDlgRespKeyCancel://all RSK press will fall here.
-						iMessage.Complete (KErrCancel);
-						break;
-					case ESyncMLDlgRespKeyOthers: //all call-termination key press fall here.
-						iMessage.Complete (KErrNotFound);
-						break;
-					default://rest of the cases and errors
-						iMessage.Complete (KErrNone);
-						break;
-				}		
-			}
-
-
-    // Complete message and free resources
-    //
-    iNeedToCompleteMessage = EFalse;
-    iReplySlot = NULL;
-
-    iNoteType = ESyncMLFwUpdUnknown;
-
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::RunL() completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::Cancel
-// Release all own resources (member variables)
-// -----------------------------------------------------------------------------
-//
-void CSyncMLFwUpdNotifier::Cancel()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::Cancel()"));
-    if(iRunLhang)
-    	{
-    	 FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::Cancel() inside Runlhang"));
-    	if(iDlg)
-    		{
-    		FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::Cancel()before exit"));
-    		TRAP_IGNORE(iDlg->ExitL());
-    		if(iDlg)
-    			{
-        		FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::Cancel()before delete"));
-    			delete iDlg;
-    			iDlg = NULL;
-        		FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::Cancel()after delete"));
-    			}
-    		}
-    	}
-    CSyncMLNotifierBase::Cancel();
-
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::Cancel() completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowUpdateErrorNoteL
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowUpdateErrorNoteL()
-    {
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateErrorNoteL() error = %d" ),
-        iNoteInfo ) );
-
-    HBufC* stringHolder( NULL );
-
-    switch ( iNoteInfo )
-        {
-        case KErrDiskFull:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_NOT_PERMITTED );
-            break;
-            }
-        case KErrCommsLineFail:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_LOST_CONNECTION );
-            break;
-            }
-        case KErrCouldNotConnect:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_SERVER_ERROR );
-            break;
-            }
-        case KErrBadPower:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_BATTERY_LOW );
-            break;
-            }
-        case KErrBadUsbPower:
-             {
-             	stringHolder = StringLoader::LoadLC( R_FOTA_USB_BATTERY_LOW ); 
-             	break;
-            }
-        case KErrCommsLineFail2:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_CONNECTION_FAIL2 );
-            break;
-            }
-        case KErrGeneralResume:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_DOWNLOAD_GENERAL_RESUME );
-            break;
-            }
-        case KErrGeneralNoResume:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_DOWNLOAD_NO_RESUME );
-            break;
-            }
-        case KErrBadPowerForEnc:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_UPDATE_ENC_BATTERY_LOW );
-            break;
-            }
-        case KErrDeviceMemoryBusy:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_DEVICE_MEMORY_BUSY );
-            break;
-            }
-        default:
-            {
-            return KErrArgument; // Will be converted to KErrNone when completing
-                                 // message, since this is not actually an error.
-            }
-        }
-
-    
-    TBool keypress(EFalse);
-	CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(keypress);
-    msgDlg->SetMessageTextL(*stringHolder);
-    
-    CleanupStack::PopAndDestroy( stringHolder );
-    
-    msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-
-    stringHolder = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );
-    msgDlg->SetHeaderTextL( stringHolder->Des() );
-    CleanupStack::PopAndDestroy( stringHolder );
-    stringHolder = NULL;
-    
-   	msgDlg->ButtonGroupContainer().SetCommandSetL( 
-    	                                  R_AVKON_SOFTKEYS_OK_EMPTY__OK );
-    
-    TInt retval (ESyncMLDlgRespKeyNone);
-    iRunLhang = ETrue;
-    iDlg = msgDlg; 
-	retval = msgDlg->RunLD();
-	iRunLhang = EFalse;
-    msgDlg = NULL;
-	iDlg = NULL;
-
-	//call-termination key press is handled here.
-	if (keypress)
-    	retval = ESyncMLDlgRespKeyOthers;
-    
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateErrorNoteL() completed: retval = %d" ),
-        retval ) );
-        
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowUpdateResultNoteL
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowUpdateResultNoteL()
-    {
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateResultNoteL() result = %d" ),
-        iNoteInfo ) );
-
-    HBufC* stringHolder( NULL );
-
-    switch ( iNoteInfo )  // It is easier to add cases to switch structure
-        {
-        case KErrNone:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_NOTIF_COMPLETE );
-            break;
-            }
-        default:
-            {
-            stringHolder = StringLoader::LoadLC( R_FOTA_MSG_QUERY_NOT_UPDATED );
-            break;
-            }
-        }
-        
-    TBool keypress(EFalse);
-	CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(keypress);
-    msgDlg->SetMessageTextL(*stringHolder);
-
-    CleanupStack::PopAndDestroy( stringHolder );
-    
-    msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-
-    stringHolder = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );
-    msgDlg->SetHeaderTextL( stringHolder->Des() );
-    CleanupStack::PopAndDestroy( stringHolder );
-    stringHolder = NULL;
-    
-   	msgDlg->ButtonGroupContainer().SetCommandSetL( 
-        									R_AVKON_SOFTKEYS_OK_EMPTY__OK );
-    TInt retval(ESyncMLDlgRespKeyNone);
-    iRunLhang = ETrue;
-    iDlg = msgDlg; 
-    retval = msgDlg->RunLD();
-    iRunLhang = EFalse;
-    msgDlg = NULL;
-    iDlg = NULL;
-	//call-termination key press has to be suppressed here. so keypress has no significance here!    
-	/*if (keypress)
-    	retval = EKeyOthers;*/
-    	
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateResultNoteL() completed: retval = %d" ),
-        retval ) );
-    
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowUpdateStartQueryL
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowUpdateStartQueryL()
-    {
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() profileId = %d" ),
-        iNoteInfo ) );
-
-    HBufC* headerText = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );
-    TInt retval (ESyncMLDlgRespKeyNone);  
-    TInt CustomNotes(KErrNone);
-    CRepository* centrep = NULL;
-    TRAPD( err, centrep = CRepository::NewL( KCRUidDeviceManagementInternalKeys) );    
-    if(!err && centrep)
-    {
-      TInt err= centrep->Get( KDevManUINotesCustomization, CustomNotes);	
-      if (err)
-       CustomNotes = 0;
-    }
-    else
-    {
-      CustomNotes = 0;	
-    }
-    TBool keypress(EFalse);
-    CSyncMLQueryDialog* dlg = CSyncMLQueryDialog::NewL(keypress);
-    TLanguage language = User::Language();
-    if((CustomNotes) && IsLanguageSupportedL())
-    {       //This note will be shown in chinese and english variant only and localisation is not done
-     CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(keypress); 
-     HBufC* stringHolder = StringLoader::LoadLC (R_QTN_FOTA_MSG_QUERY_UPDATE_CUSTOM_WARNING);     
-     msgDlg->SetMessageTextL(*stringHolder);
-     CleanupStack::PopAndDestroy( stringHolder );
-     stringHolder = NULL;
-     msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-     msgDlg->SetHeaderTextL( headerText->Des() );
-     msgDlg->ButtonGroupContainer().SetCommandSetL( R_FOTA_INSTALL_QUERY_SOFTKEYS_NOW_LATER__NOW );
-     retval = ESyncMLDlgRespKeyNone;
-     retval = msgDlg->RunLD();
-     msgDlg = NULL;
-     FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() after new changes in phone updates"));
-    }
-    else
-    {
-      TBuf< KSyncMLMaxProfileNameLength > profileName;
-      RetrieveProfileNameL( profileName ); 
-      
-  HBufC* stringHolder = NULL;
-	retval = ESyncMLDlgRespKeyOk;    	
-	TBool bShowInstallQuery = ETrue;
-	TInt fotaUpdateAppName (EFotaUpdateDM);
-	TInt errAppName = RProperty::Get( KPSUidNSmlDMSyncApp, KNSmlCurrentFotaUpdateAppName, fotaUpdateAppName );
-	TInt errShowInstall = RProperty::Get( KPSUidNSmlDMSyncApp, KDevManShowInstallNowQuery, bShowInstallQuery );
-
-	FTRACE( FPrint(
-	    _L("CSyncMLFwUpdNotifier::ShowUpdateStartQueryL found key Show install query = %d"),
-	    bShowInstallQuery ) );
-
-
-	if ( !errAppName && !errShowInstall && fotaUpdateAppName == EFotaUpdateNSC && !bShowInstallQuery )
-	{
-			FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() do not show install now query "));	
-			bShowInstallQuery = EFalse;
-	}
-
-	if ( !bShowInstallQuery )
-	{
-		
-		FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() should not query "));	
-										
-	}
-	
-	else
-		
-	{
-		FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() will query for Install now? "));		
-    stringHolder = StringLoader::LoadLC( R_FOTA_QUERY_INSTALL_NOW, profileName );
-    dlg->SetPromptL( *stringHolder );
-    CleanupStack::PopAndDestroy( stringHolder );
-    stringHolder = NULL;
-    retval = ESyncMLDlgRespKeyNone;
-    
-
-    retval = dlg->ExecuteLD( R_FOTA_INSTALL_CONFIRMATION_QUERY );
-	dlg = NULL;
-	}	
-	// set KDevManShowInstallNowQuery key back to value that it should show query
-	TInt err = RProperty::Set(KPSUidNSmlDMSyncApp,KDevManShowInstallNowQuery,1 );
-	FTRACE( FPrint(
-	    _L("Install query is set back to be shown, err = %d"),
-	    err ) );
-	
-    if ( !keypress && retval )
-        {
-        stringHolder = StringLoader::LoadLC( R_FOTA_UPDATE_1_WARNING );
-                
-        //keypress is EFalse here
-        CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(keypress);
-        
-        msgDlg->SetMessageTextL(*stringHolder);
-        CleanupStack::PopAndDestroy( stringHolder );
-        stringHolder = NULL;
-
-        msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-        msgDlg->SetHeaderTextL( headerText->Des() );
-        
-       	msgDlg->ButtonGroupContainer().SetCommandSetL( R_SML_SOFTKEYS_ACCEPT_CANCEL__ACCEPT );
-        
-        retval = ESyncMLDlgRespKeyNone;;
-        retval = msgDlg->RunLD();
-        msgDlg = NULL;
-		
-		
-		if ( !keypress && retval )
-			{
-	        stringHolder = StringLoader::LoadLC( R_FOTA_UPDATE_2_WARNING );
-	        
-	        //keypress is EFalse here
-	        msgDlg = CSyncMLMessageQueryDialog::NewL(keypress);
-            msgDlg->SetMessageTextL( *stringHolder );
-
-	        CleanupStack::PopAndDestroy( stringHolder );
-	        stringHolder = NULL;
-
-	        msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-	        msgDlg->SetHeaderTextL( headerText->Des() );
-	        
-        	msgDlg->ButtonGroupContainer().SetCommandSetL( 
-	        						R_SML_SOFTKEYS_ACCEPT_CANCEL__ACCEPT );
-        
-	        retval = ESyncMLDlgRespKeyNone;
-	        retval = msgDlg->RunLD();
-	        msgDlg = NULL;
-			}
-        }
-        }
-    
-
-    CleanupStack::PopAndDestroy( headerText );
-    
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() completed: retval = %d, keypress = %d" ),
-        retval,keypress ) );
-
-	//call-termination key press is handled here.
-	if (keypress)
-    	retval = ESyncMLDlgRespKeyOthers;
-	
-    return retval;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowUpdateStartQueryEncryptionL
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowUpdateStartQueryEncryptionL()
-    {
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryEncryptionL() profileId = %d" ),
-        iNoteInfo ) );
-
-    HBufC* headerText = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );
-    TInt retval (ESyncMLDlgRespKeyNone);  
-    TBool keypress(EFalse);
-
-    CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(keypress); 
-    HBufC* stringHolder = StringLoader::LoadLC (R_FOTA_UPDATE_DEC_WARNING);     
-    msgDlg->SetMessageTextL(*stringHolder);
-    CleanupStack::PopAndDestroy( stringHolder );
-   
-    msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-    msgDlg->SetHeaderTextL( headerText->Des() );
-    msgDlg->ButtonGroupContainer().SetCommandSetL( R_SML_SOFTKEYS_ACCEPT_CANCEL__ACCEPT );
-    retval = ESyncMLDlgRespKeyNone;
-    retval = msgDlg->RunLD();
-    msgDlg = NULL;
-    
-    CleanupStack::PopAndDestroy(headerText);
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateStartQueryL() after new changes in phone updates"));
-    return retval;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowUpdateResultNoteL
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowUpdateResultWithEncryptionNoteL()
-    {
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateResultWithEncryptionNoteL() result = %d" ),
-        iNoteInfo ) );
-
-    HBufC* firstStr( NULL );
-
-    switch ( iNoteInfo )  // It is easier to add cases to switch structure
-        {
-        case KErrNone:
-            {
-            firstStr = StringLoader::LoadLC( R_FOTA_NOTIF_COMPLETE );
-            break;
-            }
-        default:
-            {
-            firstStr = StringLoader::LoadLC( R_FOTA_MSG_QUERY_NOT_UPDATED );
-            break;
-            }
-        }
-    
-    HBufC* secStr  = StringLoader::LoadLC(R_FOTA_UPDATE_ENC);
-    
-    HBufC* stringHolder = HBufC::NewLC(firstStr->Length() + secStr->Length());
-    TPtr ptr (stringHolder->Des());
-    ptr.Append(firstStr->Des());
-    ptr.Append(secStr->Des());
-    
-    TBool keypress(EFalse);
-    CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(keypress);
-    msgDlg->SetMessageTextL(*stringHolder);
-    CleanupStack::PopAndDestroy( stringHolder );
-    CleanupStack::PopAndDestroy(secStr);
-    CleanupStack::PopAndDestroy(firstStr);
-
-    
-    msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-
-    stringHolder = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );
-    msgDlg->SetHeaderTextL( stringHolder->Des() );
-    CleanupStack::PopAndDestroy( stringHolder );
-    stringHolder = NULL;
-    
-    msgDlg->ButtonGroupContainer().SetCommandSetL( R_SML_SOFTKEYS_ACCEPT_CANCEL__ACCEPT );
-    TInt retval(ESyncMLDlgRespKeyNone);
-    iRunLhang = ETrue;
-    iDlg = msgDlg; 
-    retval = msgDlg->RunLD();
-    iRunLhang = EFalse;
-    msgDlg = NULL;
-    iDlg = NULL;
-    //call-termination key press has to be suppressed here. so keypress has no significance here!    
-    /*if (keypress)
-        retval = EKeyOthers;*/
-        
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowUpdateResultWithEncryptionNoteL() completed: retval = %d" ),
-        retval ) );
-    
-    return retval;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::RetrieveProfileNameL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLFwUpdNotifier::RetrieveProfileNameL( TDes& aServerName )
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLFwUpdNotifier::RetrieveProfileNameL()"));
-
-    RSyncMLSession syncSession;
-    RSyncMLDevManProfile syncProfile;
-  
-    syncSession.OpenL();
-    CleanupClosePushL( syncSession );
-    
-    syncProfile.OpenL( syncSession, iNoteInfo, ESmlOpenRead );
-    CleanupClosePushL( syncProfile );
-    
-    aServerName = syncProfile.DisplayName();
-
-    CleanupStack::PopAndDestroy( &syncProfile );
-    CleanupStack::PopAndDestroy( &syncSession );
-
-    FTRACE( FPrint( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::RetrieveProfileNameL() completed: aServerName = %S" ),
-        &aServerName ) );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowNoReminderQuery
-// -----------------------------------------------------------------------------
-//
-
-TInt CSyncMLFwUpdNotifier::ShowNoReminderQueryL()
-	{
-
-    FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowNoReminderQueryL() begin "));
-        
-   	TInt configFlags( 0 );
-    CRepository* cenrep = NULL;
-    cenrep = CRepository::NewL( KCRUidNSmlDMSyncApp );
-    cenrep->Get( KNSmlDMFotaConfigurationKey, configFlags );
-    delete cenrep;
-    cenrep = NULL;
-	TInt retval (KErrNone);
-	
-    // Show note if fota is not hidden
-    if ( configFlags & KNSmlDMFotaEnableFotaViewFlag )
-    	{
-    	HBufC* headerText = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );
-    	HBufC* stringHolder = StringLoader::LoadLC( R_FOTA_UPDATE_REMINDER );
-        
-    	TBool keypress(EFalse);        
-        CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(keypress);
-        msgDlg->SetMessageTextL(*stringHolder);
-        CleanupStack::PopAndDestroy( stringHolder );
-        stringHolder = NULL;
-
-        msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-        msgDlg->SetHeaderTextL( headerText->Des() );
-            
-        msgDlg->ButtonGroupContainer().SetCommandSetL( R_AVKON_SOFTKEYS_OK_EMPTY__OK );
-        retval = msgDlg->RunLD();
-        msgDlg = NULL;
-
-		//call-termination key press is handled here.
-		if (keypress)
-    		retval = ESyncMLDlgRespKeyOthers;
-		
-        CleanupStack::PopAndDestroy( headerText );
-    	}
-        
-     FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowNoReminderQueryL() Completed "));   
-     
-     return retval;
-	}
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowNotEnoughMemory
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowNotEnoughMemoryL( TInt &aMemoryNeeded , TBool aOmaDL)
-{
-  	FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowNotEnoughMemoryL() begin "));
-        
-  	HBufC* headerText = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );  
-  	
-  	HBufC* stringHolder;
-  	
-  	if( aOmaDL )	
-  	stringHolder = StringLoader::LoadLC( R_FOTA_OMADL_NO_FLEXIBLE_MEMORY , aMemoryNeeded );
-  	else
-  	stringHolder = StringLoader::LoadLC( R_FOTA_LARGE_NO_FLEXIBLE_MEMORY , aMemoryNeeded );
-    
-    TBool keypress(EFalse);  	
-    CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(keypress);
-	msgDlg->SetMessageTextL(*stringHolder);
-  	CleanupStack::PopAndDestroy( stringHolder );
-  	stringHolder = NULL;
-  
-  	msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-  	msgDlg->SetHeaderTextL( headerText->Des() );
-           
-  	msgDlg->ButtonGroupContainer().SetCommandSetL( R_AVKON_SOFTKEYS_OK_EMPTY__OK );
-  	TInt retval (ESyncMLDlgRespKeyNone);
-  	retval = msgDlg->RunLD();
-  	msgDlg = NULL;
-  	CleanupStack::PopAndDestroy( headerText );
-  
-  	FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowNotEnoughMemoryL() Completed "));    	
-	
-	//call-termination key press is handled here.
-	if (keypress)
-    	retval = ESyncMLDlgRespKeyOthers;
-	
-	return retval;
-}
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowDownloadUserCancelL
-// Shows the notification when the user cancels the download.
-// And inform the user the download is suspended.
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowDownloadUserCancelL()
-{
-
-    FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowDownloadUserCancelL() begin "));
-        
-  	TInt retval (KErrNone);
-	
-    HBufC* headerText = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );
-    HBufC* stringHolder = StringLoader::LoadLC( R_FOTA_USER_CANCEL );
-        
-    TBool endKeyPress(EFalse);        
-    CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(endKeyPress);
-    msgDlg->SetMessageTextL(*stringHolder);
-    CleanupStack::PopAndDestroy( stringHolder );
-    stringHolder = NULL;
-
-    msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-    msgDlg->SetHeaderTextL( headerText->Des() );
-            
-    msgDlg->ButtonGroupContainer().SetCommandSetL( R_AVKON_SOFTKEYS_YES_NO__YES );
-    iRunLhang = ETrue;
-    iDlg = msgDlg;
-    retval = msgDlg->RunLD();
-    iRunLhang = EFalse;
-    msgDlg = NULL;    
-    iDlg = NULL;
-	//call-termination key press is handled here.
-	if (endKeyPress)
-    	retval = ESyncMLDlgRespKeyOthers;
-		
-    CleanupStack::PopAndDestroy( headerText );
-        
-     FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowDownloadUserCancelL() Completed "));   
-     
-     return retval;
-}
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowDownloadPostponedL
-// Shows the notification that the download is postponed.
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowDownloadPostponedL()
-{
-
-    FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowDownloadPostponedL() begin "));
-    
-    TInt retval (KErrNone);
-    
-    HBufC* stringHolder = StringLoader::LoadLC( R_FOTA_DOWNLOAD_POSTPONED );
-    CAknInformationNote* infoNote = new (ELeave) CAknInformationNote;
-
-    infoNote->ExecuteLD( *stringHolder );
-    CleanupStack::PopAndDestroy( stringHolder );
-  	
-    FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowDownloadPostponedL() Completed "));   
-     
-    return retval;
-}
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowDownloadCancelledL
-// Shows the notification that the download is cancelled.
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowDownloadCancelledL()
-{
-
-    FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowDownloadCancelledL() begin "));
-        
-  	TInt retval (KErrNone);
-	
-    HBufC* stringHolder = StringLoader::LoadLC( R_FOTA_DOWNLOAD_CANCELLED );
-    CAknInformationNote* infoNote = new (ELeave) CAknInformationNote;
-
-    infoNote->ExecuteLD( *stringHolder );
-    CleanupStack::PopAndDestroy( stringHolder );
-        
-    FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowDownloadCancelledL() Completed "));   
-     
-    return retval;
-}
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowDownloadResumeL
-// Shows the notification to the user for resuming the download.
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLFwUpdNotifier::ShowDownloadResumeL()
-{
-
-    FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowDownloadResumeL() begin "));
-        
-  	TInt retval (KErrNone);
-	
-    HBufC* headerText = StringLoader::LoadLC( R_FOTA_TITLE_PHONE_UPDATES );
-    HBufC* stringHolder = StringLoader::LoadLC( R_FOTA_DOWNLOAD_RESUME );
-        
-    TBool endKeyPress(EFalse);        
-    CSyncMLMessageQueryDialog* msgDlg = CSyncMLMessageQueryDialog::NewL(endKeyPress);
-    msgDlg->SetMessageTextL(*stringHolder);
-    CleanupStack::PopAndDestroy( stringHolder );
-    stringHolder = NULL;
-
-    msgDlg->PrepareLC( R_SML_MESSAGE_QUERY );  // Pushed dialog is popped inside RunLD
-    msgDlg->SetHeaderTextL( headerText->Des() );
-            
-    msgDlg->ButtonGroupContainer().SetCommandSetL( R_AVKON_SOFTKEYS_YES_NO__YES );
-    iRunLhang = ETrue;
-    iDlg = msgDlg;
-    retval = msgDlg->RunLD();
-    iRunLhang = EFalse;
-    iDlg = NULL;
-    msgDlg = NULL;
-    
-	//call-termination key press is handled here.
-	if (endKeyPress)
-    	retval = ESyncMLDlgRespKeyOthers;
-		
-    CleanupStack::PopAndDestroy( headerText );
-        
-     FLOG( _L(
-        "[SmlNotif]\t CSyncMLFwUpdNotifier::ShowDownloadResumeL() Completed "));   
-     
-     return retval;
-}
-
-// -----------------------------------------------------------------------------
-// CSyncMLFwUpdNotifier::ShowDownloadResumeL
-// Shows the notification to the user for resuming the download.
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLFwUpdNotifier::IsLanguageSupportedL()
-{
-	TBool retVal(EFalse);
-	TLanguage language = User::Language();
-	if(language == ELangEnglish || language == ELangInternationalEnglish ||
- 		   language == ELangTaiwanChinese ||language == ELangHongKongChinese || language == ELangPrcChinese)
- 		   retVal = ETrue;
- 	return retVal;
-}
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLMessageQueryDialog.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Message Query Dialogue
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "SyncMLMessageQueryDialog.h"
-#include "SyncMLNotifDebug.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLMessageQueryDialog::CSyncMLMessageQueryDialog
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLMessageQueryDialog::CSyncMLMessageQueryDialog(TBool& aKeyPress  ):iKeyPress(aKeyPress)
-    
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLMessageQueryDialog::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLMessageQueryDialog* CSyncMLMessageQueryDialog::NewL(TBool& aKeyPress )
-    {
-    CSyncMLMessageQueryDialog* self =
-        new( ELeave ) CSyncMLMessageQueryDialog (aKeyPress  );
-    
-    return self;
-    }
-
-    
-// -----------------------------------------------------------------------------
-// CSyncMLMessageQueryDialog::~CSyncMLMessageQueryDialog
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLMessageQueryDialog::~CSyncMLMessageQueryDialog()
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLMessageQueryDialog::OkToExitL
-// Determines if the dialog can be closed..
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLMessageQueryDialog::OkToExitL( TInt aButtonId )
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLMessageQueryDialog::OkToExitL()"));
-    return CAknQueryDialog::OkToExitL( aButtonId );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLMessageQueryDialog::NeedToDismissQueryL
-// Called by OfferkeyEventL(), gives a change to dismiss the query even with
-// keys different than Enter of Ok.
-// -----------------------------------------------------------------------------
-//    
-TBool CSyncMLMessageQueryDialog::NeedToDismissQueryL(const TKeyEvent& aKeyEvent)
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLMessageQueryDialog::NeedToDismissQueryL()"));
-    if (aKeyEvent.iCode == EKeyNo)
-        {
-        FLOG(_L("[SmlNotif]\t CSyncMLMessageQueryDialog::NeedToDismissQueryL()--EKeyNo"));
-        iKeyPress=ETrue;
-		DismissQueryL();
-        return ETrue;
-        }
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLMessageQueryDialog::ExitL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLMessageQueryDialog::ExitL()
-	{
-	FLOG(_L("[SmlNotif]\t CSyncMLMessageQueryDialog::ExitL()"));
-	OkToExitL( EKeyNo );
-	}
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLNotifierBase.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,287 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Implementation of the SyncML Appserver starter notifier
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <centralrepository.h>
-#include <CoreApplicationUIsSDKCRKeys.h>
-#include <settingsinternalcrkeys.h>
-#include <e32property.h>
-#include <coreapplicationuisdomainpskeys.h>
-#include <eikenv.h>          // Eikon environment
-#include <uikon/eiksrvui.h>        // Eikon server ui (for suppressing app -key)
-#include <bautils.h>         // BAFL utils (for language file)
-#include <data_caging_path_literals.hrh> 
-#include <AknNotiferAppServerApplication.h>
-
-#include "SyncMLNotifierBase.h"
-#include "SyncMLNotifDebug.h"
-
-// CONSTANTS
-// Literals for resource and bitmap files ( drive, directory, filename(s) )
-_LIT(KFileDrive,"z:");
-_LIT(KResourceFileName, "SyncMLNotifier.rsc");
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::CSyncMLNotifierBase
-// C++ default constructor can NOT contain any code, that
-// might leave. Sets the AOs priority and puts
-// itself to the active scheduler stack.
-// -----------------------------------------------------------------------------
-//
-CSyncMLNotifierBase::CSyncMLNotifierBase() : CActive(EPriorityStandard)
-    {
-    CActiveScheduler::Add(this);
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::ConstructL
-// Symbian 2nd phase constructor can leave.
-// Create registry object and open resource file.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLNotifierBase::ConstructL()
-    {
-    FLOG(_L("[SmlNotif]\t CSyncMLNotifierBase::ConstructL()"));
-
-    iEikEnv = CEikonEnv::Static();
-
-    TFileName filename;
-    filename += KFileDrive;
-    filename += KDC_RESOURCE_FILES_DIR; 
-    filename += KResourceFileName;
-    BaflUtils::NearestLanguageFile( iEikEnv->FsSession(), filename );
-    iResourceFileFlag = iEikEnv->AddResourceFileL( filename );
-    FLOG(_L("[SmlNotif]\t CSyncMLNotifierBase::ConstructL() completed"));
-    }
-    
-// -----------------------------------------------------------------------------
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLNotifierBase::~CSyncMLNotifierBase()
-    {
-    Cancel();
-    iEikEnv->DeleteResourceFile( iResourceFileFlag );
-
-    // Complete the RMessage2 if needed
-    //
-    if ( iNeedToCompleteMessage )
-        {
-        iMessage.Complete( KErrDied );
-        }
-
-	// Activate apps -key again (if not previously activated yet)
-	SuppressAppSwitching( EFalse );
-
-    iReplySlot = NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::Release
-// Release itself. Call to destructor.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLNotifierBase::Release()
-    {
-    delete this;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::Info
-// Return registered information.
-// -----------------------------------------------------------------------------
-//
-CSyncMLNotifierBase::TNotifierInfo CSyncMLNotifierBase::Info() const
-    {
-    return iInfo;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::StartL
-// Synchronic notifier launch. Does nothing here.
-// -----------------------------------------------------------------------------
-//
-TPtrC8 CSyncMLNotifierBase::StartL( const TDesC8& /*aBuffer*/ )
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::StartL(sync)") );
-    TPtrC8 ret( KNullDesC8 );
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::StartL(sync) completed") );
-    return ( ret );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::StartL
-// Asynchronic notifier launch.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLNotifierBase::StartL( const TDesC8& aBuffer,
-                                        TInt aReplySlot,
-                                  const RMessagePtr2& aMessage )
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::StartL(async)") );
-    TRAPD( err, GetParamsL( aBuffer, aReplySlot, aMessage ) );
-    if ( err )
-        {
-        aMessage.Complete( err );
-        iNeedToCompleteMessage = EFalse;
-        User::Leave( err );
-        }
-    FLOG(_L("[SmlNotif]\t CSyncMLNotifierBase::StartL(async) completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::Cancel
-// Cancelling method.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLNotifierBase::Cancel()
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::Cancel()") );
-    if (iNeedToCompleteMessage)
-    	{
-    	iMessage.Complete(KErrCancel);
-    	iNeedToCompleteMessage = EFalse;
-    	}
-    iNeedToCompleteMessage = EFalse;
-    iReplySlot = NULL;
-
-    // Activate apps -key again (if not previously activated yet)
-	SuppressAppSwitching( EFalse );
-
-    CActive::Cancel();
-
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::Cancel() completed") );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::UpdateL
-// Notifier update. Not supported.
-// -----------------------------------------------------------------------------
-//
-TPtrC8 CSyncMLNotifierBase::UpdateL(const TDesC8& /*aBuffer*/)
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::UpdateL()") );
-    TPtrC8 ret(KNullDesC8);
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::UpdateL() completed") );
-    return ret;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::DoCancel
-// This method will be called by framework (CActive)
-// if active object is still active.
-// Does nothing here.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLNotifierBase::DoCancel()
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::DoCancel()") );
-	FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::DoCancel()--End") );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::RunError
-// This method is called if any leaving has been occured
-// during RunL. Optional method for CActive derived objects.
-// -----------------------------------------------------------------------------
-//
-TInt CSyncMLNotifierBase::RunError( TInt aError )
-    {
-    FTRACE( FPrint( _L("[SmlNotif]\t CSyncMLNotifierBase::RunError() Error = %d"), aError ) );
-    // Activate apps -key again (if not previously activated yet)
-	SuppressAppSwitching( EFalse );
-
-    // Complete message if needed and return the error code.
-    if( iNeedToCompleteMessage )
-        {
-        iMessage.Complete( aError );
-        }
-    iNeedToCompleteMessage = EFalse;
-    iReplySlot = NULL;
-
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::RunError() completed") );
-
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::TurnLightsOn
-// -----------------------------------------------------------------------------
-//
-void CSyncMLNotifierBase::TurnLightsOn()
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::TurnLightsOn()") );
-
-    RProperty::Set( KPSUidCoreApplicationUIs, KLightsControl, ELightsOn );
-    RProperty::Set( KPSUidCoreApplicationUIs, KLightsControl, ELightsOff );
-
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::TurnLightsOn() completed") );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::AutoLockOnL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLNotifierBase::AutoLockOnL()
-    {
-    FLOG( _L("[SmlNotif]\t CSyncMLNotifierBase::AutoLockOnL()") );
-
-    TBool result = EFalse;
-    TInt status = 1;
-    
-    // Connecting and initialization:
-    CRepository* repository = CRepository::NewL( KCRUidSecuritySettings );
-
-    repository->Get( KSettingsAutolockStatus, status );
-
-    // Closing connection:
-    delete repository;
-
-    if ( status == 1 )
-        {
-        result = ETrue;
-        }
-
-    FTRACE( FPrint(
-        _L("[SmlNotif]\t CSyncMLNotifierBase::AutoLockOnL() completed with %d"),
-        result ) );
-
-    return result;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CSyncMLNotifierBase::SuppressAppSwitchching
-// -----------------------------------------------------------------------------
-//
-void CSyncMLNotifierBase::SuppressAppSwitching( TBool aEnable )
-    {	   
-    if ( iAppsKeyBlocked != aEnable )
-        {
-        TInt err = ( ( CAknNotifierAppServerAppUi* )
-            ( CEikonEnv::Static() )->EikAppUi() )->
-            SuppressAppSwitching( aEnable );
-        iAppsKeyBlocked = aEnable;
-        }
-    }
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLNotifierMain.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Methods for the SyncML Appserver starter notifier
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <eikenv.h>
-
-// All provided notifiers
-#include    "SyncMLAppLaunchNotifier.h"
-#include    "SyncMLDlgNotifier.h"
-#include    "SyncMLFwUpdNotifier.h"
-
-#include    "SyncMLNotifDebug.h"
-
-// CONSTANTS
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CleanupArray
-// Deletes notifiers
-// -----------------------------------------------------------------------------
-LOCAL_C void CleanupArray( TAny* aArray )
-    {
-    FLOG(_L("[SmlNotif]\t CleanupArray()"));
-    
-    CArrayPtrFlat<MEikSrvNotifierBase2>*     
-        subjects = static_cast<CArrayPtrFlat<MEikSrvNotifierBase2>*>(aArray);
-    TInt lastInd = subjects->Count() - 1;
-    for ( TInt i = lastInd; i >= 0; i-- )
-        {
-        subjects->At(i)->Release();	    	    
-        }
-    delete subjects;
-    
-    FLOG(_L("[SmlNotif]\t CleanupArray() completed"));
-    }
-
-// -----------------------------------------------------------------------------
-// CreateSmlNotifiersL
-// Instantiate notifiers
-// -----------------------------------------------------------------------------
-LOCAL_C CArrayPtrFlat<MEikSrvNotifierBase2>* CreateSmlNotifiersL()
-    {
-    FLOG(_L("[SmlNotif]\t CreateSmlNotifiersL"));
-
-    CArrayPtrFlat<MEikSrvNotifierBase2>* notifiers =
-        new ( ELeave ) CArrayPtrFlat<MEikSrvNotifierBase2>
-        ( KSmlNotifierArrayIncrement );
-    
-    CleanupStack::PushL( TCleanupItem( CleanupArray, notifiers ) );
-    
-    CSyncMLAppLaunchNotifier* appLaunchNotifier = CSyncMLAppLaunchNotifier::NewL();
-    CleanupStack::PushL( appLaunchNotifier );
-    notifiers->AppendL( appLaunchNotifier );
-    CleanupStack::Pop( appLaunchNotifier );
-
-    CSyncMLDlgNotifier* dlgNotifier = CSyncMLDlgNotifier::NewL( appLaunchNotifier );
-    CleanupStack::PushL( dlgNotifier );
-    notifiers->AppendL( dlgNotifier );
-    CleanupStack::Pop( dlgNotifier );
-
-    CSyncMLFwUpdNotifier* fwUpdNotifier = CSyncMLFwUpdNotifier::NewL();
-    CleanupStack::PushL( fwUpdNotifier );
-    notifiers->AppendL( fwUpdNotifier );
-    CleanupStack::Pop( fwUpdNotifier );
-
-    CleanupStack::Pop( notifiers );
-    
-    FLOG(_L("[SmlNotif]\t CreateSmlNotifiersL completed"));
-    return notifiers;
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// NotifierArray
-// Lib main entry point: Creates a notifiers array.
-// -----------------------------------------------------------------------------
-EXPORT_C CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
-    {
-    FLOG( _L("[SMLNOTIF]\t NotifierArray") );
-
-    CArrayPtrFlat<MEikSrvNotifierBase2>* notifiers = NULL;
-    TRAPD( err, notifiers = CreateSmlNotifiersL() );
-
-    if( err != KErrNone )
-        {
-        FTRACE(FPrint(_L("[SmlNotif]\t Notifier creation failure! Error code: %d"), err));
-        err = KErrNone;
-        }
-
-    FLOG(_L("[SmlNotif]\t NotifierArray completed"));
-
-    return notifiers;
-    }
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLQueryDialog.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Implementation of the query dialog.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "SyncMLQueryDialog.h"
-#include "SyncMLNotifDebug.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLQueryDialog::CSyncMLQueryDialog
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLQueryDialog::CSyncMLQueryDialog(TBool& aKeyPress  ):iKeyPress(aKeyPress)
-    
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLQueryDialog::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLQueryDialog* CSyncMLQueryDialog::NewL(TBool& aKeyPress )
-    {
-    CSyncMLQueryDialog* self =
-        new( ELeave ) CSyncMLQueryDialog (aKeyPress  );
-    
-    return self;
-    }
-
-    
-// -----------------------------------------------------------------------------
-// CSyncMLQueryDialog::~CSyncMLQueryDialog
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLQueryDialog::~CSyncMLQueryDialog()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLQueryDialog::OkToExitL
-// Determines if the dialog can be closed.
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLQueryDialog::OkToExitL( TInt aButtonId )
-    {
-    return CAknQueryDialog::OkToExitL( aButtonId );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLQueryDialog::NeedToDismissQueryL
-// Called by OfferkeyEventL(), gives a change to dismiss the query even with
-// keys different than Enter of Ok.
-// -----------------------------------------------------------------------------
-// 
-TBool CSyncMLQueryDialog::NeedToDismissQueryL(const TKeyEvent& aKeyEvent)
-    {
-    if (aKeyEvent.iCode == EKeyNo)
-        {
-        iKeyPress=ETrue;
-		DismissQueryL();
-        return ETrue;
-        }
-    return EFalse;
-    }
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLQueryTimer.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Timer for queries that have timeout.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include    "SyncMLQueryTimer.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLQueryTimer::CSyncMLQueryTimer
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLQueryTimer::CSyncMLQueryTimer( MSyncMLQueryTimerObserver* aObserver )
-    : CTimer( EPriorityStandard ), iObserver( aObserver )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLQueryTimer::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CSyncMLQueryTimer::ConstructL()
-    {
-	CTimer::ConstructL();
-	CActiveScheduler::Add( this );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLQueryTimer::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLQueryTimer* CSyncMLQueryTimer::NewL( MSyncMLQueryTimerObserver* aObserver )
-    {
-    CSyncMLQueryTimer* self = new( ELeave ) CSyncMLQueryTimer( aObserver );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-    
-// Destructor
-CSyncMLQueryTimer::~CSyncMLQueryTimer()
-    {
-    
-    }
-
-
-// -----------------------------------------------------------------------------
-// CSyncMLQueryTimer::RunL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLQueryTimer::RunL()
-    {
-    if ( iObserver )
-        {
-        iObserver->TimerExpired();
-        }
-    }
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLTimedDateQuery.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Implementation of the message query with timeout timer.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "SyncMLTimedDateQuery.h"
-#include "SyncMLNotifDebug.h"
-
-// CONSTANTS
-const TInt  KSyncMLuSecsInSec   = 1000000; // Microseconds in a second
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedDateQuery::CSyncMLTimedDateQuery
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedDateQuery::CSyncMLTimedDateQuery( TTime& aDate, TBool& aKeypress,TInt aTimeout )
-    : CAknTimeQueryDialog(aDate, ENoTone),iTimeout( aTimeout ),iKeypress( aKeypress )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedDateQuery::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedDateQuery* CSyncMLTimedDateQuery::NewL( TTime& aDataText, const TDesC& aPromptText,
-                                                     TBool& aKeypress, TInt  aTimeout )
-    {
-    CSyncMLTimedDateQuery* self =
-        new( ELeave ) CSyncMLTimedDateQuery ( aDataText, aKeypress, aTimeout );
-    
-    CleanupStack::PushL( self );
-    self->SetPromptL( aPromptText );//chenge to set prompt
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedDateQuery::~CSyncMLTimedDateQuery()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedDateQuery::~CSyncMLTimedDateQuery()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedDateQuery::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLTimedDateQuery::OkToExitL( TInt aButtonId )
-    {
-    if ( aButtonId == KErrTimedOut )
-        {
-        return ETrue;
-        }
-    return CAknTimeQueryDialog::OkToExitL( aButtonId );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedDateQuery::TimerExpired
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedDateQuery::TimerExpired()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        iTimeout = KSyncMLNNoTimeoutDate;
-        }
-    TRAPD( err, TryExitL( KErrTimedOut ) );
-    
-    if ( err != KErrNone )
-        {
-        FTRACE( FPrint(
-            _L("[SmlNotif]\t CSyncMLTimedDateQuery::TimerExpired() TryExitL returned %d"),
-            err ) );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedDateQuery::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedDateQuery::PostLayoutDynInitL()
-    {
-    if ( iTimeout > KSyncMLNNoTimeoutDate )
-        {
-        iTimer = CSyncMLQueryTimer::NewL( this );
-        iTimer->After( iTimeout * KSyncMLuSecsInSec );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedDateQuery::NeedToDismissQueryL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLTimedDateQuery::NeedToDismissQueryL( const TKeyEvent& aKeyEvent )
-    {
-    if (aKeyEvent.iCode == EKeyNo)
-        {
-            iKeypress = ETrue;
-            DismissQueryL();
-            return ETrue;
-            
-        }
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedDateQuery::DismissQueryL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedDateQuery::DismissQueryL()
-	{
-	 TryExitL(EEikBidCancel);
-	}
-
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLTimedInputTextQuery.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Implementation of the text input query with timeout timer.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "SyncMLTimedInputTextQuery.h"
-#include "SyncMLNotifDebug.h"
-
-// CONSTANTS
-const TInt  KSyncMLuSecsInSec   = 1000000; // Microseconds in a second
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedInputTextQuery::CSyncMLTimedInputTextQuery
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedInputTextQuery::CSyncMLTimedInputTextQuery( TDes& aDataText, TBool& aKeypress, TInt aTimeout )
-    : CAknTextQueryDialog(aDataText, ENoTone),iTimeout( aTimeout ),iKeypress(aKeypress)
-    {
-    
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedInputTextQuery::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedInputTextQuery* CSyncMLTimedInputTextQuery::NewL( TDes& aDataText, const TDesC& aPromptText,
-                                                              TBool& aKeypress, TInt  aTimeout )
-    {
-    CSyncMLTimedInputTextQuery* self =
-        new( ELeave ) CSyncMLTimedInputTextQuery ( aDataText, aKeypress, aTimeout );
-    
-    CleanupStack::PushL( self );
-    self->SetPromptL( aPromptText );//chenge to set prompt
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedInputTextQuery::CSyncMLTimedInputTextQuery()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedInputTextQuery::~CSyncMLTimedInputTextQuery()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        }
-    }
- 
-// -----------------------------------------------------------------------------
-// CSyncMLTimedInputTextQuery::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLTimedInputTextQuery::OkToExitL( TInt aButtonId )
-    {
-    if ( aButtonId == KErrTimedOut )
-        {
-        return ETrue;
-        }
-    return CAknTextQueryDialog::OkToExitL( aButtonId );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedInputTextQuery::TimerExpired
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedInputTextQuery::TimerExpired()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        iTimeout = KSyncMLNNoAlphanumTimeout;
-        }
-    TRAPD( err, TryExitL( KErrTimedOut ) );
-    
-    if ( err != KErrNone )
-        {
-        FTRACE( FPrint(
-            _L("[SmlNotif]\t CSyncMLTimedInputTextQuery::TimerExpired() TryExitL returned %d"),
-            err ) );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedInputTextQuery::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedInputTextQuery::PostLayoutDynInitL()
-    {
-    if ( iTimeout > KSyncMLNNoAlphanumTimeout )
-        {
-        iTimer = CSyncMLQueryTimer::NewL( this );
-        iTimer->After( iTimeout * KSyncMLuSecsInSec );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedInputTextQuery::NeedToDismissQueryL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLTimedInputTextQuery::NeedToDismissQueryL(const TKeyEvent& aKeyEvent)
-    {
-    if (aKeyEvent.iCode == EKeyNo)
-        {
-        //CAknQueryControl* control = QueryControl();
-        //if (control && control->QueryType() == EPinLayout)
-          //  {
-          iKeypress = ETrue;
-            DismissQueryL();
-            return ETrue;
-            //}
-        }
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedInputTextQuery::DismissQueryL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedInputTextQuery::DismissQueryL()
-	{
-	 TryExitL(EEikBidCancel);
-	}
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedInputTextQuery::HandleQueryEditorStateEventL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLTimedInputTextQuery::HandleQueryEditorStateEventL(CAknQueryControl* aQueryControl, TQueryControlEvent aEventType, TQueryValidationStatus aStatus)
-	{
- 	if ( aQueryControl )
-  {
- 		if( EPhoneLayout == aQueryControl->QueryType() )
- 	 	{
-			if (aEventType == EEmergencyCallAttempted)
-        	{
-        	TryExitL(EEikBidCancel);
-        	}
-    	else
-        	{
-        	
-         	TBuf<KSyncMLMaxDefaultResponseMsgLength> PhoneNo;
-         	aQueryControl->GetText( PhoneNo );
-         	TInt posplus = PhoneNo.LocateReverse('+');
-          	if(posplus==0 || posplus==KErrNotFound )
-           	{
-           	CAknQueryDialog::HandleQueryEditorStateEventL(aQueryControl,aEventType,aStatus);	
-           	}
-          	else
-           	{      
-          	MakeLeftSoftkeyVisible(EFalse);
-           	}
-         	}  
-  	 }
-  }
- 	else //For all other layouts 
- 	 {
- 	CAknQueryDialog::HandleQueryEditorStateEventL(aQueryControl,aEventType,aStatus);	
- 	 }
-	return EFalse;
-	}
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLTimedMessageQuery.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Implementation of the message query with timeout timer.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "SyncMLTimedMessageQuery.h"
-#include "SyncMLNotifDebug.h"
-
-// CONSTANTS
-const TInt  KSyncMLuSecsInSec   = 1000000; // Microseconds in a second
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::CSyncMLTimedMessageQuery
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedMessageQuery::CSyncMLTimedMessageQuery( TInt aTimeout )
-    : iTimeout( aTimeout )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedMessageQuery* CSyncMLTimedMessageQuery::NewL( const TDesC& aMessage,
-                                                                TInt  aTimeout )
-    {
-    CSyncMLTimedMessageQuery* self =
-        new( ELeave ) CSyncMLTimedMessageQuery ( aTimeout );
-    
-    CleanupStack::PushL( self );
-    self->SetMessageTextL( aMessage );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-    
-// Destructor
-CSyncMLTimedMessageQuery::~CSyncMLTimedMessageQuery()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLTimedMessageQuery::OkToExitL( TInt aButtonId )
-    {
-    if ( aButtonId == KErrTimedOut )
-        {
-        return ETrue;
-        }
-    return CAknQueryDialog::OkToExitL( aButtonId );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::TimerExpired
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedMessageQuery::TimerExpired()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        iTimeout = KSyncMLNNoTimeout;
-        }
-    TRAPD( err, TryExitL( KErrTimedOut ) );
-    
-    if ( err != KErrNone )
-        {
-        FTRACE( FPrint(
-            _L("[SmlNotif]\t CSyncMLTimedMessageQuery::TimerExpired() TryExitL returned %d"),
-            err ) );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedMessageQuery::PostLayoutDynInitL()
-    {
-    if ( iTimeout > KSyncMLNNoTimeout )
-        {
-        iTimer = CSyncMLQueryTimer::NewL( this );
-        iTimer->After( iTimeout * KSyncMLuSecsInSec );
-        }
-    }
-
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLTimedNumberQueryDialog.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Implementation of the query dialog with timeout timer.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "SyncMLTimedNumberQueryDialog.h"
-#include "SyncMLNotifDebug.h"
-
-// CONSTANTS
-const TInt  KSyncMLuSecsInSec   = 1000000; // Microseconds in a second
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedNumberQueryDialog::CSyncMLTimedNumberQueryDialog
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedNumberQueryDialog::CSyncMLTimedNumberQueryDialog( TReal& aValue, TBool& aKeypress,TInt aTimeout ):
-CAknFloatingPointQueryDialog( aValue, CAknQueryDialog::EConfirmationTone )
-   
-    {
-     iTimeout = aTimeout ;
-     iKeypress = aKeypress;
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedNumberQueryDialog::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedNumberQueryDialog* CSyncMLTimedNumberQueryDialog::NewL( TReal& aValue,                                                              
-                                const TDesC& aMessage,TBool& aKeypress, TInt  aTimeout )                                                             
-    {
-    CSyncMLTimedNumberQueryDialog* self =
-        new( ELeave ) CSyncMLTimedNumberQueryDialog( aValue, aKeypress, aTimeout ) ;
-    
-    CleanupStack::PushL( self );
-    
-    	self->SetPromptL( aMessage );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-  
-// -----------------------------------------------------------------------------
-// CSyncMLTimedNumberQueryDialog::~CSyncMLTimedNumberQueryDialog
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedNumberQueryDialog::~CSyncMLTimedNumberQueryDialog()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedNumberQueryDialog::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLTimedNumberQueryDialog::OkToExitL( TInt aButtonId )
-    {
-    if ( aButtonId == KErrTimedOut )
-        {
-        return ETrue;
-        }
-    return CAknFloatingPointQueryDialog::OkToExitL( aButtonId );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedNumberQueryDialog::TimerExpired
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedNumberQueryDialog::TimerExpired()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        iTimeout = KSyncMLNNoTimeout;
-        }
-    TRAPD( err, TryExitL( KErrTimedOut ) );
-    
-    if ( err != KErrNone )
-        {
-        FTRACE( FPrint(
-            _L("[SmlNotif]\t CSyncMLTimedNumberQueryDialog::TimerExpired() \
-             TryExitL returned %d"), err ) );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedNumberQueryDialog::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedNumberQueryDialog::PostLayoutDynInitL()
-    {
-    if ( iTimeout > KSyncMLNNoTimeout )
-        {
-        iTimer = CSyncMLQueryTimer::NewL( this );
-        iTimer->After( iTimeout * KSyncMLuSecsInSec );
-        }
-    CAknFloatingPointQueryDialog::PostLayoutDynInitL();
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedNumberQueryDialog::NeedToDismissQueryL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLTimedNumberQueryDialog::NeedToDismissQueryL( const TKeyEvent& aKeyEvent )
-    {
-    if (aKeyEvent.iCode == EKeyNo)
-        {
-        
-          iKeypress = ETrue;
-          DismissQueryL();
-          return ETrue;
-            
-        }
-    return EFalse;
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedNumberQueryDialog::DismissQueryL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedNumberQueryDialog::DismissQueryL()
-	{
-	 TryExitL(EEikBidCancel);
-	}
-
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/SyncMLTimedQueryDialog.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Implementation of the query dialog with timeout timer.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "SyncMLTimedQueryDialog.h"
-#include "SyncMLNotifDebug.h"
-
-// CONSTANTS
-const TInt  KSyncMLuSecsInSec   = 1000000; // Microseconds in a second
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::CSyncMLTimedMessageQuery
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedQueryDialog::CSyncMLTimedQueryDialog( TInt aTimeout )
-    : iTimeout( aTimeout )
-    {
-    iTone = EConfirmationTone;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CSyncMLTimedQueryDialog* CSyncMLTimedQueryDialog::NewL( const TDesC& aMessage,
-                                                                TInt  aTimeout )
-    {
-    CSyncMLTimedQueryDialog* self =
-        new( ELeave ) CSyncMLTimedQueryDialog ( aTimeout );
-    
-    CleanupStack::PushL( self );
-    self->SetPromptL( aMessage );
-    CleanupStack::Pop( self );
-
-    return self;
-    }
-
-    
-// Destructor
-CSyncMLTimedQueryDialog::~CSyncMLTimedQueryDialog()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::OkToExitL
-// -----------------------------------------------------------------------------
-//
-TBool CSyncMLTimedQueryDialog::OkToExitL( TInt aButtonId )
-    {
-    if ( aButtonId == KErrTimedOut )
-        {
-        return ETrue;
-        }
-    return CAknQueryDialog::OkToExitL( aButtonId );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::TimerExpired
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedQueryDialog::TimerExpired()
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        delete iTimer;
-        iTimer = NULL;
-        iTimeout = KSyncMLNNoTimeout;
-        }
-    TRAPD( err, TryExitL( KErrTimedOut ) );
-    
-    if ( err != KErrNone )
-        {
-        FTRACE( FPrint(
-            _L("[SmlNotif]\t CSyncMLTimedQueryDialog::TimerExpired() \
-             TryExitL returned %d"), err ) );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CSyncMLTimedMessageQuery::PostLayoutDynInitL
-// -----------------------------------------------------------------------------
-//
-void CSyncMLTimedQueryDialog::PostLayoutDynInitL()
-    {
-    if ( iTimeout > KSyncMLNNoTimeout )
-        {
-        iTimer = CSyncMLQueryTimer::NewL( this );
-        iTimer->After( iTimeout * KSyncMLuSecsInSec );
-        }
-    CAknQueryDialog::PostLayoutDynInitL();
-    }
-
-
-//  End of File  
--- a/syncmlfw/syncmlnotifier/src/syncmlmmcwatcher.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +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:  Methods for the SyncML Appserver starter notifier
- *
- */
-
-#include "syncmlmmcwatcher.h"
-
-// -----------------------------------------------------------------------------
-// CSyncmlmmcwatcher::NewL()
-// -----------------------------------------------------------------------------
-CSyncmlmmcwatcher* CSyncmlmmcwatcher::NewL( MSyncMLQueryMmcObserver* aObserver )
-    {
-    CSyncmlmmcwatcher* self = new( ELeave ) CSyncmlmmcwatcher( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncmlmmcwatcher::CSyncmlmmcwatcher()
-// -----------------------------------------------------------------------------
-inline CSyncmlmmcwatcher::CSyncmlmmcwatcher(MSyncMLQueryMmcObserver* aObserver)    
-    {    
-    immcobserver = aObserver;
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncmlmmcwatcher::ConstructL()
-// -----------------------------------------------------------------------------
-void CSyncmlmmcwatcher::ConstructL()
-    {    
-    TInt err = iMemoryCard.Connect();
-    if ( err == KErrNone )
-        {
-        }
-
-    else
-        User::LeaveIfError(err);
-    iDiskNotifyHandler = CDiskNotifyHandler::NewL( *this, iMemoryCard );
-    }
-
-// -----------------------------------------------------------------------------
-// CSyncmlmmcwatcher::StartL()
-// Logs a request to notify the disk events
-// -----------------------------------------------------------------------------
-void CSyncmlmmcwatcher::StartL()
-    {   
-    FLOG(_L("CSyncmlmmcwatcher::Start- begin"));
-
-    if(iDiskNotifyHandler)
-        {
-        iDiskNotifyHandler->NotifyDisk();
-        }
-    }
-
-// ----------------------------------------------------------------------------------------
-// CSyncmlmmcwatcher::~CSyncmlmmcwatcher() 
-// Destructor
-// ----------------------------------------------------------------------------------------
-CSyncmlmmcwatcher::~CSyncmlmmcwatcher()
-    { 
-    FLOG(_L("CSyncmlmmcwatcher::~CSyncmlmmcwatcher()"));  
-    if(iDiskNotifyHandler)
-        {
-        iDiskNotifyHandler->CancelNotifyDisk();
-        delete iDiskNotifyHandler;
-        iDiskNotifyHandler = NULL;
-        }
-
-    if(iMemoryCard.Handle())
-        {
-        iMemoryCard.Close();
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CSyncmlmmcwatcher::HandleNotifyDisk
-// Callback method to notify disk events
-// ---------------------------------------------------------------------------
-//
-void CSyncmlmmcwatcher::HandleNotifyDisk( TInt aError, const TDiskEvent& aEvent )
-    {
-    FTRACE( FPrint(
-            _L( "CSysApMMCObserver::HandleNotifyDisk: error: %d, type: %d, drive: %d," ),
-            aError, aEvent.iType, aEvent.iDrive ) );
-
-    if ( aError != KErrNone )
-        {
-        return;
-        }
-    else
-        {
-        if(immcobserver)
-            {
-            FLOG(_L("mmc removal check"));
-            TInt diskinserted = EFalse;
-            RProperty::Get(KPSUidUikon, KUikMMCInserted,diskinserted);
-            if(diskinserted)//EDiskStatusChanged called for insert & hard removal
-                {
-                FLOG(_L("disk inserted"));
-                }
-            else
-                {
-                FLOG(_L("disk removed"));
-                immcobserver->MmcRemoved();
-                }
-            FLOG(_L("mmcremoved call completed"));
-            }
-        }
-
-    }
-
-// ---------------------------------------------------------------------------
-// CSyncmlmmcwatcher::CancelMmcwatch
-// Cancels the notification
-// ---------------------------------------------------------------------------
-//
-void CSyncmlmmcwatcher::CancelMmcwatch()
-    {
-    if(iDiskNotifyHandler)
-        {
-        iDiskNotifyHandler->CancelNotifyDisk();
-        }
-    }
--- a/syncmlfw/syncservice/BWINS/SyncServiceu.def	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXPORTS
-	??0CSyncServiceSession@@QAE@XZ @ 1 NONAME ; CSyncServiceSession::CSyncServiceSession(void)
-	?NewL@CSyncService@@SAPAV1@PAVMAknServerAppExitObserver@@I@Z @ 2 NONAME ; class CSyncService * CSyncService::NewL(class MAknServerAppExitObserver *, unsigned int)
-	?StartSyncL@CSyncService@@QAE?AVTUid@@UTSyncServiceParam@@@Z @ 3 NONAME ; class TUid CSyncService::StartSyncL(struct TSyncServiceParam)
-	?EnableProgressNoteL@CSyncService@@QAEXH@Z @ 4 NONAME ; void CSyncService::EnableProgressNoteL(int)
-
--- a/syncmlfw/syncservice/INC/SyncServiceDebug.h	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2005 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:  This file defines logging macros for SyncService
-*
-*/
-
-
-
-#ifndef NSMLDMSYNCSERVICEDEBUG_H
-#define NSMLDMSYNCSERVICEDEBUG_H
-
-#ifdef _DEBUG
-// ===========================================================================
-#ifdef __WINS__     // File logging for WINS
-// ===========================================================================
-#include <e32std.h>
-#include <f32file.h>
-#include <flogger.h>
-
-_LIT( KLogFile, "OmaDMApp.log" );
-_LIT( KLogDirFullName, "c:\\logs\\" );
-_LIT( KLogDir, "OmaDMApp" );
-
-#define FLOG( a )   { FPrint(a); }
-#define FTRACE( a ) { a; }
-
-// Declare the FPrint function
-//
-inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-    RFileLogger::WriteFormat( KLogDir,
-                              KLogFile,
-                              EFileLoggingModeAppend,
-                              aFmt,
-                              list );
-    }
-
-// ===========================================================================
-#else               // RDebug logging for target HW
-// ===========================================================================
-#include <e32svr.h>
-
-#define FLOG( a )   { RDebug::Print( a ); }
-#define FTRACE( a ) { a; }
-
-// Declare the FPrint function
-//
-inline void FPrint( const TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-    TInt tmpInt = VA_ARG( list, TInt );
-    TInt tmpInt2 = VA_ARG( list, TInt );
-    TInt tmpInt3 = VA_ARG( list, TInt );
-    VA_END( list );
-    RDebug::Print( aFmt, tmpInt, tmpInt2, tmpInt3 );
-    }
-
-#endif //__WINS__
-
-// ===========================================================================
-#else // // No loggings --> Reduced binary size
-// ===========================================================================
-#define FLOG( a )
-#define FTRACE( a )
-
-#endif // _DEBUG
-
-#endif      // NSMLDMSYNCSERVICEDEBUG_H
-            
-// End of File
\ No newline at end of file
--- a/syncmlfw/syncservice/SRC/SyncService.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,328 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Client for DS and DM initiated syncs
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include <bldvariant.hrh>
-
-#include <centralrepository.h>
-#include <SyncMLNotifierDomainCRKeys.h>
-#include <SyncServiceSession.h>
-#include <SyncServiceParams.h>
-#include <SyncService.h>
-#include <SyncServiceConst.h>
-#include "SyncServiceDebug.h"
-
-#include <apgcli.h>
-#include <AknServerApp.h>
-#include <barsread2.h>
-
-// ----------------------------------------------------------------------------
-// RSyncService::StartSyncL
-// ----------------------------------------------------------------------------
-//
-void RSyncService::StartSyncL( TSyncServiceParam aParam )
-	{
-	FLOG( _L( "[RSyncService] StartSyncL" ) );
-	
-	TSyncParameters parameters;
-	parameters.iCommand = KSyncServCmdStartSync;
-    parameters.iJobId = aParam.iJobId;
-    parameters.iProfileId = aParam.iProfileId;
-    parameters.iSilent = aParam.iSilent;
-    TInt err = 
-		SendReceive( ESyncServiceCommand, TIpcArgs( parameters.iCommand,
-		                                            parameters.iJobId,
-		                                            parameters.iProfileId,
-		                                            parameters.iSilent ) );
-	User::LeaveIfError( err );
-	}
-
-// ----------------------------------------------------------------------------
-// RSyncService::EnableProgressNoteL
-// ----------------------------------------------------------------------------
-//
-void RSyncService::EnableProgressNoteL( TBool aEnabled )
-	{
-	FLOG( _L("[RSyncService] EnableProgressNoteL") );
-
-	TSyncParameters parameters;
-	parameters.iCommand = KSyncServCmdShowProgress;
-
-    if ( aEnabled )
-        {
-        parameters.iJobId = KSyncServEnabled;
-        }
-    else
-        {
-        parameters.iJobId = KSyncServDisabled;
-        }
-    
-    TInt err = 
-		SendReceive( ESyncServiceCommand, TIpcArgs( parameters.iCommand,
-		                                            parameters.iJobId,
-		                                            parameters.iProfileId,
-		                                            parameters.iSilent ) );
-	User::LeaveIfError( err );
-	}
-
-// ----------------------------------------------------------------------------
-// RSyncService::ServiceUid
-// ----------------------------------------------------------------------------
-//
-TUid RSyncService::ServiceUid() const
-	{
-	FLOG( _L( "[RSyncService] ServiceUid" ) );
-	
-	return TUid::Uid( KSyncServiceUid );
-	}
-
-// ----------------------------------------------------------------------------
-// CSyncService::CSyncService
-// ----------------------------------------------------------------------------
-//
-CSyncService::CSyncService( )
-	{
-	FLOG( _L( "[CSyncService] CSyncService" ) );
-	
-	}
-
-// ----------------------------------------------------------------------------
-// CSyncService::~CSyncService
-// ----------------------------------------------------------------------------
-//
-CSyncService::~CSyncService( )
-	{
-	FLOG( _L( "[CSyncService] ~CSyncService" ) );
-	
-	delete iMonitor;
-	iService.Close();
-	}
-
-// ----------------------------------------------------------------------------
-// CSyncService::NewL
-// ----------------------------------------------------------------------------
-//
-EXPORT_C CSyncService* CSyncService::NewL( MAknServerAppExitObserver* aObserver,
-                                           TUint aServiceId )
-    {
-    FLOG( _L( "[CSyncService] NewL" ) );
-    
-	CSyncService* self = new(ELeave) CSyncService();
-	CleanupStack::PushL(self);
-    self->ConstructL( aObserver, aServiceId );
-	CleanupStack::Pop(self);
-	return self;
-    }
-
-// ----------------------------------------------------------------------------
-// CSyncService::ConstructL
-// ----------------------------------------------------------------------------
-//
-void CSyncService::ConstructL( MAknServerAppExitObserver* /*aObserver*/,
-                               TUint aServiceId )
-    {
-	FLOG( _L( "[CSyncService] ConstructL" ) );
-    iServiceId = aServiceId;
-    }
-
-// ----------------------------------------------------------------------------
-// CSyncService::StartSyncL
-// ----------------------------------------------------------------------------
-//
-EXPORT_C TUid CSyncService::StartSyncL( TSyncServiceParam aParam )
-    {
-    FLOG( _L( "[CSyncService] StartSyncL" ) );
-
-    iServiceId = aParam.iServiceId;
-	iUid = DiscoverL( iServiceId );
-	
-    TInt error = KErrNotFound;
-        
-    if( iService.ServerName().Length() > 0 )
-        {
-        FLOG( _L( "[CSyncService] ConstructL connect to existing app" ) );
-  	    TRAP( error, iService.StartSyncL( aParam ) );
-  	    if ( error == KErrNone )
-  	        {
-  	        return iUid;
-  	        }
-        }
-   	if ( error )
-		{
-		TFullName aServerName;
-		if ( iServiceId == KDevManServiceStart )
-		    {
-    		CRepository* centrep = NULL;
-    		centrep = CRepository::NewL( KCRUidNSmlNotifierDomainKeys );
-    		centrep->Get( KNSmlDMAppName, aServerName );
-    		delete centrep;
-		    }
-		else
-		    {
-		    aServerName = KDataSyncServiceName;
-		    }
-        FLOG( _L( "[CSyncService] ConstructL connect to existing app with predefined name" ) );
-        iService.Close();
-		TRAP( error, iService.ConnectExistingByNameL( aServerName ) );
-		}
-   	if ( error )
-		{
-		FLOG( _L( "[CSyncService] ConstructL connect to new app" ) );
-    	TRAP( error, iService.ConnectNewAppL( iUid ) );
-    	if( error )
-    		{
-    		FLOG( _L( "[CSyncService] ConnectNewAppL: Error not supported" ) );
-    		User::Leave( KErrNotSupported );
-    		}
- 		}
-    
-    iService.StartSyncL( aParam );
-    return iUid;
-    }
-
-// ----------------------------------------------------------------------------
-// CSyncService::EnableProgressNoteL
-// ----------------------------------------------------------------------------
-//
-EXPORT_C void CSyncService::EnableProgressNoteL( TBool aEnabled )
-    {
-    FLOG( _L( "[CSyncService] EnableProgressNoteL" ) );
-    
-    TFullName DmAppName;
-    CRepository* centrep = NULL;
-    centrep = CRepository::NewL( KCRUidNSmlNotifierDomainKeys );
-    centrep->Get( KNSmlDMAppName, DmAppName );
-    delete centrep;
-    
-    if( iService.ServerName().Length() > 0 )
-        {
-		TRAPD(error, iService.EnableProgressNoteL( aEnabled ) );
-		if ( error != KErrNone )
-		    {
-    		TFullName aServerName;
-    		if ( iServiceId == KDevManServiceStart )
-    		    {
-                aServerName = DmAppName;
-    		    }
-    		else
-    		    {
-    		    aServerName = KDataSyncServiceName;
-    		    }
-            FLOG( _L( "[CSyncService] EnableProgressNoteL connect to existing app with predefined name" ) );
-            iService.Close();
-    		iService.ConnectExistingByNameL( aServerName );        
-            iService.EnableProgressNoteL( aEnabled );
-		    }
-        }
-    else
-        {
-        // Sync has been started from APP UI so connect to the service and enable progressnote
-		TFullName aServerName;
-		if ( iServiceId == KDevManServiceStart )
-		    {
-		    aServerName = DmAppName;
-		    }
-		else
-		    {
-		    aServerName = KDataSyncServiceName;
-		    }
-        FLOG( _L( "[CSyncService] EnableProgressNoteL connect to existing app with predefined name" ) );
-		iService.ConnectExistingByNameL( aServerName );        
-        iService.EnableProgressNoteL( aEnabled );
-        }
-    FLOG( _L( "[CSyncService] EnableProgressNoteL" ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSyncService::DiscoverL
-// ----------------------------------------------------------------------------
-//
-TUid CSyncService::DiscoverL( TUint aServiceId )
-	{
-	FLOG( _L( "[CSyncService] DiscoverL" ) );
-	
-	CApaAppServiceInfoArray* services = NULL;	
-	RApaLsSession ls;
-	TUid appUid = TUid::Uid( 0x0 ); // Set the uid as NULL
-	
-	if( ls.Connect() == KErrNone )
-		{
-	    CleanupClosePushL( ls );
-		TInt ret = ls.GetServerApps( TUid::Uid( KSyncServiceUid ) );
-
-		if( ret != KErrNone )
-			{
-		    CleanupStack::PopAndDestroy( );  // closes RApaLsSession		
-		    return appUid; // return NULL appUid
-			}
-
-		services = ls.GetServiceImplementationsLC( TUid::Uid( KSyncServiceUid ) );			
-		
-		if( services )
-			{
-			TArray<TApaAppServiceInfo> s = services->Array( );
-			
-			TInt count = s.Count( );
-		
-			if( count != 0)
-				{	// 
-				for( TInt i = 0; i < count; i++ )
-					{
-					if( TryMatchL( s[i], appUid, aServiceId ) )
-						{ // If one of the services match, return the uid set by TryMatchL
-						break;
-						}
-					}
-				}		
-			}
-	    CleanupStack::PopAndDestroy( 2 );  // destroys services + closes RApaLsSession
-		}
-	return appUid;
-	}
-
-// ----------------------------------------------------------------------------
-// CSyncService::TryMatchL
-// ----------------------------------------------------------------------------
-//
-TBool CSyncService::TryMatchL( const TApaAppServiceInfo aInfo,
-                               TUid& aAppUid,
-                               TUint aServiceId )
-	{
-	FLOG( _L( "[CSyncService] TryMatchL" ) );
-	
-	RResourceReader r;
-	r.OpenLC( aInfo.OpaqueData() );
-
-	TInt serviceType = r.ReadUint32L( ); // the service type (sync start)
-
-    CleanupStack::PopAndDestroy( );				
-	
-	if( serviceType == aServiceId )
-		{
-		aAppUid.iUid = aInfo.Uid( ).iUid;
-		FLOG( _L( "[CSyncService] TryMatchL return ETrue" ) );
-		return ETrue;
-		}
-    
-    FLOG( _L( "[CSyncService] TryMatchL return EFalse" ) );
-	return EFalse;	
-	}
-	
-// End of file
--- a/syncmlfw/syncservice/SRC/SyncServiceSession.cpp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Server side DS and DM sync services
-*
-*/
-
-
-// INCLUDE FILES
-
-#include <SyncServiceSession.h>
-#include <SyncServiceParams.h>
-#include "SyncServiceDebug.h"
-
-#include <eikenv.h>
-#include <eikappui.h>
-#include <s32mem.h>
-
-const TInt KMemoryStoreBuffSize = 127;
-
-// ----------------------------------------------------------------------------
-// CSyncServiceSession::CSyncServiceSesson
-// ----------------------------------------------------------------------------
-//
-EXPORT_C CSyncServiceSession::CSyncServiceSession( )
-: iDoc( CEikonEnv::Static()->EikAppUi()->Document() )
-	{
-    FLOG( _L( "[CSyncServiceSession] CSyncServiceSession" ) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSyncServiceSession::~CSyncServiceSesson
-// ----------------------------------------------------------------------------
-//
-CSyncServiceSession::~CSyncServiceSession()
-	{
-	FLOG( _L( "[CSyncServiceSession] ~CSyncServiceSession" ) );
-	}
-
-// ----------------------------------------------------------------------------
-// CSyncServiceSession::CreateL
-// ----------------------------------------------------------------------------
-//
-void CSyncServiceSession::CreateL()
-	{
-	FLOG( _L( "[CSyncServiceSession] CreateL" ) );
-	
-	CAknAppServiceBase::CreateL();		
-	}
-	
-// ----------------------------------------------------------------------------
-// CSyncServiceSession::ServiceL
-// ----------------------------------------------------------------------------
-//
-void CSyncServiceSession::ServiceL( const RMessage2& aMessage )
-	{
-	FLOG( _L( "[CSyncServiceSession] ServiceL" ) );
-	
-	switch( aMessage.Function() )
-		{
-		case ESyncServiceCommand:
-			OpenEmbeddedL( aMessage );
-			break;
-		default:
-			CAknAppServiceBase::ServiceL( aMessage );
-			break;
-		}		
-	}
-	
-// ----------------------------------------------------------------------------
-// CSyncServiceSession::ServiceError
-// ----------------------------------------------------------------------------
-//
-void CSyncServiceSession::ServiceError( const RMessage2& aMessage, TInt aError )
-	{
-	FLOG( _L( "[CSyncServiceSession] ServiceError" ) );
-	
-	CAknAppServiceBase::ServiceError( aMessage, aError );		
-	}
-	
-// ----------------------------------------------------------------------------
-// CSyncServiceSession::OpenEmbeddedL
-// ----------------------------------------------------------------------------
-//
-void CSyncServiceSession::OpenEmbeddedL( const RMessage2& aMessage )
-	{
-	FLOG( _L( "[CSyncServiceSession] OpenEmbeddedL" ) );
-
-	TSyncParameters params;
-	params.iCommand = aMessage.Int0();
-	params.iJobId = aMessage.Int1();
-	params.iProfileId = aMessage.Int2();
-    params.iSilent = aMessage.Int3();
-    CBufStore* store = CBufStore::NewLC( KMemoryStoreBuffSize );
-    RStoreWriteStream outStream;
-    TStreamId id = outStream.CreateLC( *store );
-    params.ExternalizeL( outStream );
-    store->CommitL();
-    CleanupStack::PopAndDestroy();//outStream
-	
-    CStreamDictionary* dic = CStreamDictionary::NewLC();
-    dic->AssignL( KUidSyncParameterValue, id );
-    outStream.CreateLC( *store );
-    dic->ExternalizeL( outStream );
-    store->CommitL();
-    CleanupStack::PopAndDestroy();// outstream
-
-    // Restore the document from this store
-    RStoreReadStream readStream;
-    readStream.OpenLC( *store, id );
-    iDoc->RestoreL( *store, *dic );
-
-    CleanupStack::PopAndDestroy(3);// dic, store, readStream
-    aMessage.Complete( KErrNone );	
-	}
-
-// End of File
--- a/syncmlfw/syncservice/eabi/SyncServiceu.def	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-EXPORTS
-	_ZN12CSyncService10StartSyncLE17TSyncServiceParam @ 1 NONAME
-	_ZN12CSyncService4NewLEP25MAknServerAppExitObserverj @ 2 NONAME
-	_ZN19CSyncServiceSessionC1Ev @ 3 NONAME
-	_ZN19CSyncServiceSessionC2Ev @ 4 NONAME
-	_ZTI12CSyncService @ 5 NONAME ; #<TI>#
-	_ZTI12RSyncService @ 6 NONAME ; #<TI>#
-	_ZTI19CSyncServiceSession @ 7 NONAME ; #<TI>#
-	_ZTV12CSyncService @ 8 NONAME ; #<VT>#
-	_ZTV12RSyncService @ 9 NONAME ; #<VT>#
-	_ZTV19CSyncServiceSession @ 10 NONAME ; #<VT>#
-	_ZN12CSyncService19EnableProgressNoteLEi @ 11 NONAME
-
--- a/syncmlfw/syncservice/group/SyncService.mmp	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2005 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:  Project specification file for SyncService
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include  <platform_paths.hrh>
-
-TARGET          syncservice.dll
-TARGETTYPE      DLL
-UID             0x1000008d 0x101F8769
-
-VENDORID    VID_DEFAULT
-CAPABILITY  CAP_CLIENT_DLL
-
-SOURCEPATH      ../SRC
-
-USERINCLUDE     ../INC
-// Default system include paths for app layer modules.
-MW_LAYER_SYSTEMINCLUDE
-
-SOURCE          SyncService.cpp
-SOURCE          SyncServiceSession.cpp
-
-LIBRARY         avkon.lib
-LIBRARY         euser.lib
-LIBRARY         estor.lib
-LIBRARY         apparc.lib
-LIBRARY         cone.lib
-LIBRARY         bafl.lib
-LIBRARY         apgrfx.lib
-LIBRARY         mtur.lib
-LIBRARY         eikcore.lib
-LIBRARY         centralrepository.lib 
-
-DEBUGLIBRARY    flogger.lib
-
-
-SMPSAFE
-//End of file
-
--- a/syncmlfw/syncservice/group/bld.inf	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2005 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:  This file provides the information required for building
-*                 the whole of SyncService
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../rom/syncservice.iby							CORE_MW_LAYER_IBY_EXPORT_PATH(syncservice.iby)
-
-PRJ_MMPFILES
-SyncService.mmp
-
-//  End of File
--- a/syncmlfw/syncservice/rom/syncservice.iby	Tue Jul 13 09:16:46 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: Implementation of syncservice component
-* 	This is part of syncservice.
-*
-*/
-
-
-#ifndef SYNCSERVICE_IBY
-#define SYNCSERVICE_IBY
-
-#ifndef NO_SYNCML_IN_ROM  // Should not be included if no SyncML components are included
-
-file=ABI_DIR\BUILD_DIR\SyncService.dll    SHARED_LIB_DIR\SyncService.dll
-
-#endif
-
-#endif // SYNCSERVICE_IBY
-
-//  End of File  
\ No newline at end of file