# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1272374717 -10800
# Node ID 649c558486f08c61cba58fad34e5c8517392dcd1
# Parent  875fd7f60fdf02c382a9f2106795db20e0783a04
Revision: 201015
Kit: 201017

diff -r 875fd7f60fdf -r 649c558486f0 filemanager/App/src/CFileManagerSettingListContainer.cpp
--- a/filemanager/App/src/CFileManagerSettingListContainer.cpp	Wed Apr 14 15:47:10 2010 +0300
+++ b/filemanager/App/src/CFileManagerSettingListContainer.cpp	Tue Apr 27 16:25:17 2010 +0300
@@ -177,8 +177,8 @@
 
     icon = CFileManagerIconArray::LoadIconL(
         KFileManagerBitmapFile,
-        EMbmFilemanagerQgn_indi_mmc_add,
-        EMbmFilemanagerQgn_indi_mmc_add_mask,
+        EMbmFilemanagerQgn_indi_usb_memc,
+        EMbmFilemanagerQgn_indi_usb_memc_mask,
         KAknsIIDQgnIndiMmcAdd.iMajor,
         KAknsIIDQgnIndiMmcAdd.iMinor,
         ETrue );
diff -r 875fd7f60fdf -r 649c558486f0 filemanager/App/src/CFileManagerViewBase.cpp
--- a/filemanager/App/src/CFileManagerViewBase.cpp	Wed Apr 14 15:47:10 2010 +0300
+++ b/filemanager/App/src/CFileManagerViewBase.cpp	Tue Apr 27 16:25:17 2010 +0300
@@ -4053,7 +4053,7 @@
                 {
                 FileManagerDlgUtils::ShowErrorNoteL( resWrong );
                 }
-            else if ( err = KErrNotReady )
+            else if ( err == KErrNotReady )
                 {
                 isDone = ETrue;
                 FileManagerDlgUtils::ShowErrorNoteL( R_QTN_MEMC_NOT_AVAILABLE );
diff -r 875fd7f60fdf -r 649c558486f0 filemanager/Engine/src/CFileManagerRestoreSettingsFull.cpp
--- a/filemanager/Engine/src/CFileManagerRestoreSettingsFull.cpp	Wed Apr 14 15:47:10 2010 +0300
+++ b/filemanager/Engine/src/CFileManagerRestoreSettingsFull.cpp	Tue Apr 27 16:25:17 2010 +0300
@@ -121,9 +121,9 @@
     iList.ResetAndDestroy();
 
     RArray< TInfo > infoArray;
+    CleanupClosePushL( infoArray );
     iEngine.GetRestoreInfoArrayL( infoArray );
-    CleanupClosePushL( infoArray );
-
+ 
     TInt count( infoArray.Count() );
     TUint32 mask( EFileManagerBackupContentFirst);
     while ( mask <= EFileManagerBackupContentLast )
diff -r 875fd7f60fdf -r 649c558486f0 filemanager/View/src/Cfilemanagerfoldernamequerydlg.cpp
--- a/filemanager/View/src/Cfilemanagerfoldernamequerydlg.cpp	Wed Apr 14 15:47:10 2010 +0300
+++ b/filemanager/View/src/Cfilemanagerfoldernamequerydlg.cpp	Tue Apr 27 16:25:17 2010 +0300
@@ -154,6 +154,9 @@
 
     // Strip any directionality markers to get pure name
     AknTextUtils::StripCharacters( ptrUserText, KFmgrDirectionalChars );
+    
+    // Remove white spaces from end, file server also ignores those
+    ptrUserText.TrimRight();
 
     // Check folder name
     TBool isValidName( EFalse );
diff -r 875fd7f60fdf -r 649c558486f0 filemanager/group/bld.inf
--- a/filemanager/group/bld.inf	Wed Apr 14 15:47:10 2010 +0300
+++ b/filemanager/group/bld.inf	Tue Apr 27 16:25:17 2010 +0300
@@ -47,7 +47,8 @@
 	  -c8,8 qgn_prop_fmgr_mmc_sub -c8,8 qgn_prop_fmgr_mmc_no_sub -c8,8 qgn_prop_fmgr_backup_sub \
 	  -c8,8 qgn_indi_connection_on_add -c8,8 qgn_menu_fmgr_remote_drive -c8,8 qgn_prop_fmgr_remote_drive_tab \
 	  -c8,8 qgn_prop_folder_empty -c8,8 qgn_indi_mmc_add -c8,8 qgn_prop_fmgr_ms_sub \
-	  -c8,8 qgn_prop_memc_ms_tab -c8,8 qgn_prop_usb_memc_sub.svg -c8,8 qgn_prop_usb_memc_tab
+	  -c8,8 qgn_prop_memc_ms_tab -c8,8 qgn_prop_usb_memc_sub.svg -c8,8 qgn_prop_usb_memc_tab \
+	  -c8,8 qgn_indi_usb_memc.svg
 #else
   OPTION SOURCES \
     -c8,1 qgn_prop_mmc_memc -c8,1 qgn_prop_phone_memc -c8,1 qgn_prop_memc_phone_tab \
@@ -55,7 +56,7 @@
 	  -c8,1 qgn_prop_memc_mmc_tab2 -c8,8 qgn_prop_file_swf_small -c8,8 qgn_prop_fmgr_phone_memc_sub \
 	  -c8,8 qgn_prop_fmgr_mmc_sub -c8,8 qgn_prop_fmgr_mmc_no_sub -c8,8 qgn_prop_fmgr_backup_sub \
 	  -c8,8 qgn_indi_connection_on_add -c8,8 qgn_menu_fmgr_remote_drive -c8,8 qgn_prop_fmgr_remote_drive_tab \
-	  -c8,8 qgn_prop_folder_empty -c8,8 qgn_indi_mmc_add  	  
+	  -c8,8 qgn_prop_folder_empty -c8,8 qgn_indi_mmc_add -c8,8 qgn_indi_usb_memc.svg  	  
 #endif	  
 END