# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1274779616 -10800
# Node ID 8423bb7ba1d2ad01b6cef870e2bcc56166d7030d
# Parent  661c849b1858722a25f7d009787e728f6a55406c
Revision: 201019
Kit: 2010121

diff -r 661c849b1858 -r 8423bb7ba1d2 omads/omadsappui/AspPreSyncPlugin/src/AspPreSyncDefaultPlugin.cpp
--- a/omads/omadsappui/AspPreSyncPlugin/src/AspPreSyncDefaultPlugin.cpp	Tue May 11 16:00:32 2010 +0300
+++ b/omads/omadsappui/AspPreSyncPlugin/src/AspPreSyncDefaultPlugin.cpp	Tue May 25 12:26:56 2010 +0300
@@ -191,6 +191,8 @@
 //
 TBool CPreSyncDefaultPlugin::CanSyncL()
     {
+    return ETrue;
+    /*
     TBool ret = ETrue;
     TInt value(0);
     
@@ -241,6 +243,7 @@
     
     CleanupStack::PopAndDestroy(roamingCheck);
     return ret;
+    */
     }
 
 // -------------------------------------------------------------------------------
diff -r 661c849b1858 -r 8423bb7ba1d2 omads/omadsappui/AspSyncUtil/src/AspSyncUtil.rss
--- a/omads/omadsappui/AspSyncUtil/src/AspSyncUtil.rss	Tue May 11 16:00:32 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/src/AspSyncUtil.rss	Tue May 25 12:26:56 2010 +0300
@@ -1925,7 +1925,7 @@
 		MENU_ITEM { command=EAspMenuCmdSync;           txt=qtn_sml_cmd_sync; },
 		MENU_ITEM { command=EAspMenuCmdNewSet;         txt=qtn_sml_cmd_create_new; },
 		MENU_ITEM { command=EAspMenuCmdEdit;           txt=qtn_sml_cmd_edit; },
-		MENU_ITEM { command=EAspMenuCmdAdvanceSettings; txt=qtn_sml_cmd_advanced_settings; },
+		//MENU_ITEM { command=EAspMenuCmdAdvanceSettings; txt=qtn_sml_cmd_advanced_settings; },
 		MENU_ITEM { command=EAspMenuCmdChangeProfile;  txt=qtn_sml_cmd_change_profile; },
     	MENU_ITEM { command=EAspMenuCmdDelete;         txt=qtn_sml_cmd_delete; },
     	MENU_ITEM { command=EAspMenuCmdAutoSync;       txt=qtn_sml_cmd_automatic_sync; },
diff -r 661c849b1858 -r 8423bb7ba1d2 omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss
--- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss	Tue May 11 16:00:32 2010 +0300
+++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss	Tue May 25 12:26:56 2010 +0300
@@ -169,7 +169,7 @@
 							display_name="Type";
 							name="TYPE";
 							data_type="";
-							enum_values={"INTERNET", "HOME", "WORK"};
+							enum_values={"INTERNET", "HOME", "WORK", "PREF"};
 							}
 						};
 					},