# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282200165 -10800
# Node ID 95243422089afa49cb71304065be508ea2d565f3
# Parent  529f3bf5c2f1ecd2caf0ec571cd1e10b6d68af7a
Revision: 201031
Kit: 201033

diff -r 529f3bf5c2f1 -r 95243422089a deviceencryption/DevEncUi/src/DevEncUiDecrViewContainer.cpp
--- a/deviceencryption/DevEncUi/src/DevEncUiDecrViewContainer.cpp	Mon Jun 21 15:26:15 2010 +0300
+++ b/deviceencryption/DevEncUi/src/DevEncUiDecrViewContainer.cpp	Thu Aug 19 09:42:45 2010 +0300
@@ -139,7 +139,7 @@
     {
     switch ( aEventType )
         {
-        case EEventItemDoubleClicked: // FALLTHROUGH
+        case EEventItemSingleClicked: // FALLTHROUGH
         case EEventEnterKeyPressed:
             {
             if ( iListBox->CurrentItemIndex() == 0 )
diff -r 529f3bf5c2f1 -r 95243422089a deviceencryption/DevEncUi/src/DevEncUiEncrViewContainer.cpp
--- a/deviceencryption/DevEncUi/src/DevEncUiEncrViewContainer.cpp	Mon Jun 21 15:26:15 2010 +0300
+++ b/deviceencryption/DevEncUi/src/DevEncUiEncrViewContainer.cpp	Thu Aug 19 09:42:45 2010 +0300
@@ -141,7 +141,7 @@
     {
     switch ( aEventType )
         {
-        case EEventItemDoubleClicked: // FALLTHROUGH
+        case EEventItemSingleClicked: // FALLTHROUGH
         case EEventEnterKeyPressed:
             {
             if ( iListBox->CurrentItemIndex() == 0 )
diff -r 529f3bf5c2f1 -r 95243422089a deviceencryption/DevEncUi/src/DevEncUiSettingItemList.cpp
--- a/deviceencryption/DevEncUi/src/DevEncUiSettingItemList.cpp	Mon Jun 21 15:26:15 2010 +0300
+++ b/deviceencryption/DevEncUi/src/DevEncUiSettingItemList.cpp	Thu Aug 19 09:42:45 2010 +0300
@@ -110,7 +110,7 @@
 //
 void CDevEncUiSettingItemList::HandleListBoxEventL(CEikListBox* aListBox, TListBoxEvent aEventType)
 	{
-    if ( aEventType == EEventItemDoubleClicked )
+    if ( aEventType == EEventItemSingleClicked )
         {
         TKeyEvent event;
         event.iCode = EKeyEnter;
diff -r 529f3bf5c2f1 -r 95243422089a filemanager/App/data/FileManager.rss
--- a/filemanager/App/data/FileManager.rss	Mon Jun 21 15:26:15 2010 +0300
+++ b/filemanager/App/data/FileManager.rss	Thu Aug 19 09:42:45 2010 +0300
@@ -34,6 +34,7 @@
 #include <filemanager.mbg>
 #include <drmcommon.loc>
 #include <activeidle3.loc>
+#include <errorres.loc>
 #include <filemanager.loc>
 #include "FileManagerEngine.hrh" // filemanager_mbm_file_location
 #include "FileManager.hrh"
@@ -1513,4 +1514,6 @@
 RESOURCE TBUF r_qtn_fmgr_usb_memory_default_name     { buf = qtn_fmgr_usb_memory_default_name; }
 
 RESOURCE TBUF r_qtn_fmgr_system_not_ready            { buf = qtn_hs_operation_failed_no_disk ; }
+RESOURCE TBUF r_qtn_fmgr_file_size_too_large         { buf = qtn_http_err_413; }
+
 // End of File
diff -r 529f3bf5c2f1 -r 95243422089a filemanager/App/src/CFileManagerViewBase.cpp
--- a/filemanager/App/src/CFileManagerViewBase.cpp	Mon Jun 21 15:26:15 2010 +0300
+++ b/filemanager/App/src/CFileManagerViewBase.cpp	Thu Aug 19 09:42:45 2010 +0300
@@ -569,7 +569,15 @@
             CleanupStack::PopAndDestroy( fullPath );
             }
         // Let SendUi handle protected files, queries and filtering
-        sendUi.ShowQueryAndSendL( msgData, caps, servicesToDim );
+        TRAPD( err, sendUi.ShowQueryAndSendL( msgData, caps, servicesToDim ) );
+        if ( err == KErrTooBig )
+            {
+            FileManagerDlgUtils::ShowErrorNoteL( R_QTN_FMGR_FILE_SIZE_TOO_LARGE );
+            }
+        else
+            {
+            User::LeaveIfError( err );
+            }
         CleanupStack::PopAndDestroy( servicesToDim );
         }
     CleanupStack::PopAndDestroy( files );
diff -r 529f3bf5c2f1 -r 95243422089a files_plat/memory_scan_popup_ui_api/inc/CMemStatePopup.h
--- a/files_plat/memory_scan_popup_ui_api/inc/CMemStatePopup.h	Mon Jun 21 15:26:15 2010 +0300
+++ b/files_plat/memory_scan_popup_ui_api/inc/CMemStatePopup.h	Thu Aug 19 09:42:45 2010 +0300
@@ -25,7 +25,7 @@
 #include <e32base.h>
 
 // USER INCLUDES
-#include "MSPUtil.h"
+#include "msputil.h"
 
 //  CONSTANTS
 const TText KRightToLeftMark = 0x200F;