# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1276064875 -10800
# Node ID ebe540617f9022b74ae79a46c86ee1d7a5d94e79
# Parent  7f4d10e921625f0e5d5c056685c2293096ed19c8
Revision: 201021
Kit: 2010123

diff -r 7f4d10e92162 -r ebe540617f90 applicationmanagement/group/bld.inf
--- a/applicationmanagement/group/bld.inf	Tue May 11 16:01:36 2010 +0300
+++ b/applicationmanagement/group/bld.inf	Wed Jun 09 09:27:55 2010 +0300
@@ -25,6 +25,7 @@
 //../rom/1020781c.txt /epoc32/RELEASE/winscw/UREL/z/private/10202be9/1020781c.txt
 
 ../rom/appmgmt.iby	CORE_APP_LAYER_IBY_EXPORT_PATH(appmgmt.iby)
+../rom/appmgmtresources.iby			LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(appmgmtresources.iby)
 // Generic configuration interface for component cenrep settings  
 ../conf/application_management.confml                        APP_LAYER_CONFML(application_management.confml)
 ../conf/application_management_1020781C.crml 	        APP_LAYER_CRML(application_management_1020781C.crml)
diff -r 7f4d10e92162 -r ebe540617f90 applicationmanagement/rom/appmgmt.iby
--- a/applicationmanagement/rom/appmgmt.iby	Tue May 11 16:01:36 2010 +0300
+++ b/applicationmanagement/rom/appmgmt.iby	Wed Jun 09 09:27:55 2010 +0300
@@ -22,7 +22,7 @@
 	
 	S60_APP_EXE(ApplicationManagement)
 
-      S60_APP_RESOURCE( ApplicationManagement )
+      
       
       // _reg.rsc has to be in "import" folder to allow updating application exe with a SISX-file
     data=\EPOC32\DATA\Z\private\10003a3f\apps\ApplicationManagement_reg.RSC \private\10003a3f\import\apps\ApplicationManagement_reg.RSC
diff -r 7f4d10e92162 -r ebe540617f90 applicationmanagement/rom/appmgmtresources.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applicationmanagement/rom/appmgmtresources.iby	Wed Jun 09 09:27:55 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* 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:   Image description file for project dcmofw
+*
+*/
+
+
+#ifndef _APPMGMTRESOURCES_IBY_
+#define _APPMGMTRESOURCES_IBY_
+
+S60_APP_RESOURCE( ApplicationManagement )
+
+#endif
+
diff -r 7f4d10e92162 -r ebe540617f90 omadm/omadmappui/src/NSmlDMDlgProfileView.cpp
--- a/omadm/omadmappui/src/NSmlDMDlgProfileView.cpp	Tue May 11 16:01:36 2010 +0300
+++ b/omadm/omadmappui/src/NSmlDMDlgProfileView.cpp	Wed Jun 09 09:27:55 2010 +0300
@@ -88,7 +88,6 @@
                                               iConnUtilResourceOffset(KErrNotFound)
 	{
 	FLOG( "[OMADM] CNSmlDMDlgProfileView::CNSmlDMDlgProfileView" );
-	
 	}
 
 // -----------------------------------------------------------------------------
@@ -126,8 +125,9 @@
 //
 TBool CNSmlDMDlgProfileView::OkToExitL( TInt aButtonId )
 	{
-	FLOG( "[OMADM] CNSmlDMDlgProfileView::OkToExitL:" );
-    
+	FLOG( "[OMADM] CNSmlDMDlgProfileView::OkToExitL:" );    
+	
+	
     if ( aButtonId == EAknSoftkeyChange )
         {
     	HandleOKL();
@@ -142,37 +142,48 @@
 		TInt retValue = CheckMandatoryFieldsL();
 		if ( retValue != KErrNotFound ) 
 			{
-			if ( ShowConfirmationNoteL( R_NSML_SETTINGS_SAVE_ANYWAY ) )
-				{
-				if ( iEditMode == ESmlCopyProfile  )
-					{
-					iDoc->MoveIndexToProfile( iProfileId );
-			        // This deletes the source profile
-			        //iDoc->DeleteProfile( index );
-			        iDoc->AppEngine()->DeleteProfileL( iProfileId );
-			        iDoc->MoveIndexToProfile( iOldProfileId );
-					}
-				else if ( iEditMode == ESmlNewProfile )
-				    {
-				    iDoc->AppEngine()->DeleteProfileL( iProfileId );
-				    }
-				//For CP stored umcompleted message
-				else if ( iEditMode == ESmlEditProfile )
-				    {
-				    iDoc->AppEngine()->DeleteProfileL( iProfileId );
-				    iDoc->RefreshProfileListL();
-				    iDoc->MoveIndexToProfile( iProfileId );
-				    }
-				//For CP umcompleted message
-				saveProfile = EFalse;
-				}
-			else
-				{
-				closeDlg = EFalse;
-				iProfileListBox->SetCurrentItemIndexAndDraw( retValue );
-				saveProfile = EFalse;
-				}
+            if(CheckUniqueFieldsL()== ENSmlServerId )
+                {
+			    STATIC_CAST( CNSmlDMSyncAppUi*,
+			                     iEikonEnv->EikAppUi())->ShowResourceErrorNoteL(R_QTN_DM_CONF_SET_DUP_SERVER_ID );
+                closeDlg = EFalse;
+                iProfileListBox->SetCurrentItemIndexAndDraw( retValue );
+                saveProfile = EFalse;
+			    }			
+		  else if(ShowConfirmationNoteL( R_NSML_SETTINGS_SAVE_ANYWAY ))
+                {
+			    
+                if ( iEditMode == ESmlCopyProfile  )
+                    {
+                    iDoc->MoveIndexToProfile( iProfileId );
+                    // This deletes the source profile
+                    //iDoc->DeleteProfile( index );
+                    iDoc->AppEngine()->DeleteProfileL( iProfileId );
+                    iDoc->MoveIndexToProfile( iOldProfileId );
+                    }
+                else if ( iEditMode == ESmlNewProfile )
+                    {
+                    iDoc->AppEngine()->DeleteProfileL( iProfileId );
+                    }
+                //For CP stored umcompleted message
+                else if ( iEditMode == ESmlEditProfile )
+                    {
+                    iDoc->AppEngine()->DeleteProfileL( iProfileId );
+                    iDoc->RefreshProfileListL();
+                    iDoc->MoveIndexToProfile( iProfileId );
+                    }
+                //For CP umcompleted message
+                saveProfile = EFalse;
+                }
+            else
+                {
+                closeDlg = EFalse;
+                iProfileListBox->SetCurrentItemIndexAndDraw( retValue );
+                saveProfile = EFalse;
+                }
+              
 			}
+			
 		if ( saveProfile )
 			{
 			SaveProfileL();	
@@ -244,6 +255,10 @@
 					{
 					iDoc->AppEngine()->DeleteProfileL( iProfileId );
 					}
+				else if ( iEditMode == ESmlNewProfile )
+                    {
+                    iDoc->AppEngine()->DeleteProfileL( iProfileId );
+                    }
 				}
 			TApaTaskList taskList(CEikonEnv::Static()->WsSession());
 	        TApaTask task1(taskList.FindApp( KFotaServerAppUid));
@@ -662,7 +677,7 @@
 			{
 			if ( iSyncAppEngine->ServerIdFoundL( item->Value()->Des(),
 			                                     iProfileId ) )
-				{		
+				{			    
 				returnValue = ENSmlServerId;
 				}
 			}