Index: src/ch/MainWnd.cpp
===================================================================
diff -u -rba618764ec3c9221fa704e905a9f807bd85ed4c5 -r8dc649003961dad64b92da67426814fb5dd862e0
--- src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision ba618764ec3c9221fa704e905a9f807bd85ed4c5)
+++ src/ch/MainWnd.cpp	(.../MainWnd.cpp)	(revision 8dc649003961dad64b92da67426814fb5dd862e0)
@@ -39,7 +39,6 @@
 #include "FileSupport.h"
 #include "StringHelpers.h"
 #include "../libchcore/TCoreException.h"
-#include "../libicpf/exception.h"
 #include "../libchcore/TTaskManagerStatsSnapshot.h"
 #include "../libchcore/TSQLiteSerializerFactory.h"
 #include "TRecentPathsTools.h"
@@ -574,10 +573,10 @@
 					spTask->Store(true);
 				bImported = true;
 			}
-			catch(icpf::exception& e)
+			catch(const chcore::TBaseException& e)
 			{
 				bImported = false;
-				e.get_info(szBuffer.get(), stBufferSize);
+				e.GetDetailedErrorInfo(szBuffer.get(), stBufferSize);
 			}
 			catch(...)
 			{
@@ -749,8 +748,6 @@
 						bool bRetrieveFreeSpace = GetPropValue<PP_SHSHOWFREESPACE>(rConfig);
 
 						std::vector<CShortcut> vShortcuts;
-						const size_t stSizeBufferSize = 64;
-						boost::shared_array<wchar_t> spSizeBuffer(new wchar_t[stSizeBufferSize]);
 
 						BOOST_FOREACH(const CString& strShortcutString, vShortcutStrings)
 						{
@@ -763,7 +760,7 @@
 								if(bRetrieveFreeSpace && GetDynamicFreeSpace(tShortcut.m_strPath, &ullSize, NULL))
 								{
 									CString strNameFormat;
-									strNameFormat.Format(_T("%s (%s)"), tShortcut.m_strName, GetSizeString(ullSize, spSizeBuffer.get(), stSizeBufferSize));
+									strNameFormat.Format(_T("%s (%s)"), tShortcut.m_strName, GetSizeString(ullSize));
 
 									tShortcut.m_strName = strNameFormat;
 								}
@@ -1033,7 +1030,7 @@
 				SetPropValue<PP_LAST_UPDATE_TIMESTAMP>(rConfig, _time64(NULL));
 				rConfig.Write();
 			}
-			catch(icpf::exception& /*e*/)
+			catch(const std::exception& /*e*/)
 			{
 				LOG_ERROR(_T("Storing last update check timestamp in configuration failed"));
 			}