--- a/idlehomescreen/sapiwrapper/hspswrapper/eabi/hspswrapper.def	Tue May 11 16:02:39 2010 +0300
+++ b/idlehomescreen/sapiwrapper/hspswrapper/eabi/hspswrapper.def	Tue May 25 12:29:32 2010 +0300
@@ -36,100 +36,101 @@
 	_ZN11hspswrapper12CHspsWrapper10AddPluginLERK6TDesC8S3_i @ 35 NONAME
 	_ZN11hspswrapper12CHspsWrapper11GetPluginsLER13RPointerArrayINS_11CPluginInfoEERK6TDesC8S7_ @ 36 NONAME
 	_ZN11hspswrapper12CHspsWrapper12MovePluginsLERK6TDesC8RK11MDesC8Array @ 37 NONAME
-	_ZN11hspswrapper12CHspsWrapper12RestoreRootLEv @ 38 NONAME
-	_ZN11hspswrapper12CHspsWrapper13RemovePluginLERK6TDesC8 @ 39 NONAME
+	_ZN11hspswrapper12CHspsWrapper13RemovePluginLERK6TDesC8 @ 38 NONAME
+	_ZN11hspswrapper12CHspsWrapper13RestoreViewsLEv @ 39 NONAME
 	_ZN11hspswrapper12CHspsWrapper13SetConfStateLERK6TDesC8S3_i @ 40 NONAME
 	_ZN11hspswrapper12CHspsWrapper14ReplacePluginLERK6TDesC8S3_ @ 41 NONAME
-	_ZN11hspswrapper12CHspsWrapper16SetActivePluginLERK6TDesC8 @ 42 NONAME
-	_ZN11hspswrapper12CHspsWrapper18SetPluginSettingsLERK6TDesC8RK13RPointerArrayINS_8CItemMapEE @ 43 NONAME
-	_ZN11hspswrapper12CHspsWrapper19RestoreDefaultConfLEv @ 44 NONAME
-	_ZN11hspswrapper12CHspsWrapper20GetAppConfigurationLEv @ 45 NONAME
-	_ZN11hspswrapper12CHspsWrapper20SetAppConfigurationLERK6TDesC8 @ 46 NONAME
-	_ZN11hspswrapper12CHspsWrapper21GetAppConfigurationsLER13RPointerArrayINS_11CPluginInfoEE @ 47 NONAME
-	_ZN11hspswrapper12CHspsWrapper23GetPluginConfigurationLERK6TDesC8 @ 48 NONAME
-	_ZN11hspswrapper12CHspsWrapper4NewLERK6TDesC8PNS_20MHspsWrapperObserverE @ 49 NONAME
-	_ZN11hspswrapper12CHspsWrapper5NewLCERK6TDesC8PNS_20MHspsWrapperObserverE @ 50 NONAME
-	_ZN11hspswrapper12CHspsWrapperD0Ev @ 51 NONAME
-	_ZN11hspswrapper12CHspsWrapperD1Ev @ 52 NONAME
-	_ZN11hspswrapper12CHspsWrapperD2Ev @ 53 NONAME
-	_ZN11hspswrapper12CPropertyMap4NewLEv @ 54 NONAME
-	_ZN11hspswrapper12CPropertyMap5NewLCEv @ 55 NONAME
-	_ZN11hspswrapper12CPropertyMap8SetNameLERK6TDesC8 @ 56 NONAME
-	_ZN11hspswrapper12CPropertyMap9SetValueLERK6TDesC8 @ 57 NONAME
-	_ZN11hspswrapper12CPropertyMapD0Ev @ 58 NONAME
-	_ZN11hspswrapper12CPropertyMapD1Ev @ 59 NONAME
-	_ZN11hspswrapper12CPropertyMapD2Ev @ 60 NONAME
-	_ZN11hspswrapper16CAddPluginResult12SetPluginIdLERK6TDesC8 @ 61 NONAME
-	_ZN11hspswrapper16CAddPluginResult4NewLEv @ 62 NONAME
-	_ZN11hspswrapper16CAddPluginResult9SetStatusEi @ 63 NONAME
-	_ZN11hspswrapper16CAddPluginResultC1Ev @ 64 NONAME
-	_ZN11hspswrapper16CAddPluginResultC2Ev @ 65 NONAME
-	_ZN11hspswrapper16CAddPluginResultD0Ev @ 66 NONAME
-	_ZN11hspswrapper16CAddPluginResultD1Ev @ 67 NONAME
-	_ZN11hspswrapper16CAddPluginResultD2Ev @ 68 NONAME
-	_ZN11hspswrapper18CHspsConfiguration10PluginInfoEv @ 69 NONAME
-	_ZN11hspswrapper18CHspsConfiguration10PluginMapsEv @ 70 NONAME
-	_ZN11hspswrapper18CHspsConfiguration10SetConfIdLERK6TDesC8 @ 71 NONAME
-	_ZN11hspswrapper18CHspsConfiguration11AddItemMapLEPNS_8CItemMapE @ 72 NONAME
-	_ZN11hspswrapper18CHspsConfiguration13AddObjectMapLEPNS_10CObjectMapE @ 73 NONAME
-	_ZN11hspswrapper18CHspsConfiguration13AddPluginMapLEPNS_10CPluginMapE @ 74 NONAME
-	_ZN11hspswrapper18CHspsConfiguration4NewLEv @ 75 NONAME
-	_ZN11hspswrapper18CHspsConfiguration5NewLCEv @ 76 NONAME
-	_ZN11hspswrapper18CHspsConfiguration8SettingsEv @ 77 NONAME
-	_ZN11hspswrapper18CHspsConfiguration9ResourcesEv @ 78 NONAME
-	_ZN11hspswrapper18CHspsConfigurationD0Ev @ 79 NONAME
-	_ZN11hspswrapper18CHspsConfigurationD1Ev @ 80 NONAME
-	_ZN11hspswrapper18CHspsConfigurationD2Ev @ 81 NONAME
-	_ZN11hspswrapper8CItemMap10SetItemIdLERK6TDesC8 @ 82 NONAME
-	_ZN11hspswrapper8CItemMap12SetItemNameLERK6TDesC8 @ 83 NONAME
-	_ZN11hspswrapper8CItemMap15AddPropertyMapLEPNS_12CPropertyMapE @ 84 NONAME
-	_ZN11hspswrapper8CItemMap4NewLEv @ 85 NONAME
-	_ZN11hspswrapper8CItemMap5NewLCEv @ 86 NONAME
-	_ZN11hspswrapper8CItemMapD0Ev @ 87 NONAME
-	_ZN11hspswrapper8CItemMapD1Ev @ 88 NONAME
-	_ZN11hspswrapper8CItemMapD2Ev @ 89 NONAME
-	_ZNK11hspswrapper10CObjectMap3TagEv @ 90 NONAME
-	_ZNK11hspswrapper10CObjectMap4PathEv @ 91 NONAME
-	_ZNK11hspswrapper10CObjectMap5NameLEv @ 92 NONAME
-	_ZNK11hspswrapper10CObjectMap9MediaTypeEv @ 93 NONAME
-	_ZNK11hspswrapper10CPluginMap13LockingStatusEv @ 94 NONAME
-	_ZNK11hspswrapper10CPluginMap15ActivationStateEv @ 95 NONAME
-	_ZNK11hspswrapper10CPluginMap8PluginIdEv @ 96 NONAME
-	_ZNK11hspswrapper10CPluginMap9PluginUidEv @ 97 NONAME
-	_ZNK11hspswrapper11CPluginInfo11DescriptionEv @ 98 NONAME
-	_ZNK11hspswrapper11CPluginInfo13MultiInstanceEv @ 99 NONAME
-	_ZNK11hspswrapper11CPluginInfo18ConfigurationStateEv @ 100 NONAME
-	_ZNK11hspswrapper11CPluginInfo3UidEv @ 101 NONAME
-	_ZNK11hspswrapper11CPluginInfo4NameEv @ 102 NONAME
-	_ZNK11hspswrapper11CPluginInfo4TypeEv @ 103 NONAME
-	_ZNK11hspswrapper11CPluginInfo8LogoIconEv @ 104 NONAME
-	_ZNK11hspswrapper11CPluginInfo8MaxChildEv @ 105 NONAME
-	_ZNK11hspswrapper11CPluginInfo9InterfaceEv @ 106 NONAME
-	_ZNK11hspswrapper12CHspsWrapper11HspsServiceEv @ 107 NONAME
-	_ZNK11hspswrapper12CHspsWrapper13HspsInterfaceEv @ 108 NONAME
-	_ZNK11hspswrapper12CHspsWrapper14ServiceHandlerEv @ 109 NONAME
-	_ZNK11hspswrapper12CPropertyMap4NameEv @ 110 NONAME
-	_ZNK11hspswrapper12CPropertyMap5ValueEv @ 111 NONAME
-	_ZNK11hspswrapper16CAddPluginResult6StatusEv @ 112 NONAME
-	_ZNK11hspswrapper16CAddPluginResult8PluginIdEv @ 113 NONAME
-	_ZNK11hspswrapper18CHspsConfiguration6ConfIdEv @ 114 NONAME
-	_ZNK11hspswrapper8CItemMap10PropertiesEv @ 115 NONAME
-	_ZNK11hspswrapper8CItemMap6ItemIdEv @ 116 NONAME
-	_ZNK11hspswrapper8CItemMap8ItemNameEv @ 117 NONAME
-	_ZTIN11hspswrapper10CObjectMapE @ 118 NONAME
-	_ZTIN11hspswrapper10CPluginMapE @ 119 NONAME
-	_ZTIN11hspswrapper11CPluginInfoE @ 120 NONAME
-	_ZTIN11hspswrapper12CHspsWrapperE @ 121 NONAME
-	_ZTIN11hspswrapper12CPropertyMapE @ 122 NONAME
-	_ZTIN11hspswrapper16CAddPluginResultE @ 123 NONAME
-	_ZTIN11hspswrapper18CHspsConfigurationE @ 124 NONAME
-	_ZTIN11hspswrapper8CItemMapE @ 125 NONAME
-	_ZTVN11hspswrapper10CObjectMapE @ 126 NONAME
-	_ZTVN11hspswrapper10CPluginMapE @ 127 NONAME
-	_ZTVN11hspswrapper11CPluginInfoE @ 128 NONAME
-	_ZTVN11hspswrapper12CHspsWrapperE @ 129 NONAME
-	_ZTVN11hspswrapper12CPropertyMapE @ 130 NONAME
-	_ZTVN11hspswrapper16CAddPluginResultE @ 131 NONAME
-	_ZTVN11hspswrapper18CHspsConfigurationE @ 132 NONAME
-	_ZTVN11hspswrapper8CItemMapE @ 133 NONAME
+	_ZN11hspswrapper12CHspsWrapper15RestoreRomConfLEv @ 42 NONAME
+	_ZN11hspswrapper12CHspsWrapper16SetActivePluginLERK6TDesC8 @ 43 NONAME
+	_ZN11hspswrapper12CHspsWrapper18SetPluginSettingsLERK6TDesC8RK13RPointerArrayINS_8CItemMapEE @ 44 NONAME
+	_ZN11hspswrapper12CHspsWrapper19RestoreDefaultConfLEv @ 45 NONAME
+	_ZN11hspswrapper12CHspsWrapper20GetAppConfigurationLEv @ 46 NONAME
+	_ZN11hspswrapper12CHspsWrapper20SetAppConfigurationLERK6TDesC8 @ 47 NONAME
+	_ZN11hspswrapper12CHspsWrapper21GetAppConfigurationsLER13RPointerArrayINS_11CPluginInfoEE @ 48 NONAME
+	_ZN11hspswrapper12CHspsWrapper23GetPluginConfigurationLERK6TDesC8 @ 49 NONAME
+	_ZN11hspswrapper12CHspsWrapper4NewLERK6TDesC8PNS_20MHspsWrapperObserverE @ 50 NONAME
+	_ZN11hspswrapper12CHspsWrapper5NewLCERK6TDesC8PNS_20MHspsWrapperObserverE @ 51 NONAME
+	_ZN11hspswrapper12CHspsWrapperD0Ev @ 52 NONAME
+	_ZN11hspswrapper12CHspsWrapperD1Ev @ 53 NONAME
+	_ZN11hspswrapper12CHspsWrapperD2Ev @ 54 NONAME
+	_ZN11hspswrapper12CPropertyMap4NewLEv @ 55 NONAME
+	_ZN11hspswrapper12CPropertyMap5NewLCEv @ 56 NONAME
+	_ZN11hspswrapper12CPropertyMap8SetNameLERK6TDesC8 @ 57 NONAME
+	_ZN11hspswrapper12CPropertyMap9SetValueLERK6TDesC8 @ 58 NONAME
+	_ZN11hspswrapper12CPropertyMapD0Ev @ 59 NONAME
+	_ZN11hspswrapper12CPropertyMapD1Ev @ 60 NONAME
+	_ZN11hspswrapper12CPropertyMapD2Ev @ 61 NONAME
+	_ZN11hspswrapper16CAddPluginResult12SetPluginIdLERK6TDesC8 @ 62 NONAME
+	_ZN11hspswrapper16CAddPluginResult4NewLEv @ 63 NONAME
+	_ZN11hspswrapper16CAddPluginResult9SetStatusEi @ 64 NONAME
+	_ZN11hspswrapper16CAddPluginResultC1Ev @ 65 NONAME
+	_ZN11hspswrapper16CAddPluginResultC2Ev @ 66 NONAME
+	_ZN11hspswrapper16CAddPluginResultD0Ev @ 67 NONAME
+	_ZN11hspswrapper16CAddPluginResultD1Ev @ 68 NONAME
+	_ZN11hspswrapper16CAddPluginResultD2Ev @ 69 NONAME
+	_ZN11hspswrapper18CHspsConfiguration10PluginInfoEv @ 70 NONAME
+	_ZN11hspswrapper18CHspsConfiguration10PluginMapsEv @ 71 NONAME
+	_ZN11hspswrapper18CHspsConfiguration10SetConfIdLERK6TDesC8 @ 72 NONAME
+	_ZN11hspswrapper18CHspsConfiguration11AddItemMapLEPNS_8CItemMapE @ 73 NONAME
+	_ZN11hspswrapper18CHspsConfiguration13AddObjectMapLEPNS_10CObjectMapE @ 74 NONAME
+	_ZN11hspswrapper18CHspsConfiguration13AddPluginMapLEPNS_10CPluginMapE @ 75 NONAME
+	_ZN11hspswrapper18CHspsConfiguration4NewLEv @ 76 NONAME
+	_ZN11hspswrapper18CHspsConfiguration5NewLCEv @ 77 NONAME
+	_ZN11hspswrapper18CHspsConfiguration8SettingsEv @ 78 NONAME
+	_ZN11hspswrapper18CHspsConfiguration9ResourcesEv @ 79 NONAME
+	_ZN11hspswrapper18CHspsConfigurationD0Ev @ 80 NONAME
+	_ZN11hspswrapper18CHspsConfigurationD1Ev @ 81 NONAME
+	_ZN11hspswrapper18CHspsConfigurationD2Ev @ 82 NONAME
+	_ZN11hspswrapper8CItemMap10SetItemIdLERK6TDesC8 @ 83 NONAME
+	_ZN11hspswrapper8CItemMap12SetItemNameLERK6TDesC8 @ 84 NONAME
+	_ZN11hspswrapper8CItemMap15AddPropertyMapLEPNS_12CPropertyMapE @ 85 NONAME
+	_ZN11hspswrapper8CItemMap4NewLEv @ 86 NONAME
+	_ZN11hspswrapper8CItemMap5NewLCEv @ 87 NONAME
+	_ZN11hspswrapper8CItemMapD0Ev @ 88 NONAME
+	_ZN11hspswrapper8CItemMapD1Ev @ 89 NONAME
+	_ZN11hspswrapper8CItemMapD2Ev @ 90 NONAME
+	_ZNK11hspswrapper10CObjectMap3TagEv @ 91 NONAME
+	_ZNK11hspswrapper10CObjectMap4PathEv @ 92 NONAME
+	_ZNK11hspswrapper10CObjectMap5NameLEv @ 93 NONAME
+	_ZNK11hspswrapper10CObjectMap9MediaTypeEv @ 94 NONAME
+	_ZNK11hspswrapper10CPluginMap13LockingStatusEv @ 95 NONAME
+	_ZNK11hspswrapper10CPluginMap15ActivationStateEv @ 96 NONAME
+	_ZNK11hspswrapper10CPluginMap8PluginIdEv @ 97 NONAME
+	_ZNK11hspswrapper10CPluginMap9PluginUidEv @ 98 NONAME
+	_ZNK11hspswrapper11CPluginInfo11DescriptionEv @ 99 NONAME
+	_ZNK11hspswrapper11CPluginInfo13MultiInstanceEv @ 100 NONAME
+	_ZNK11hspswrapper11CPluginInfo18ConfigurationStateEv @ 101 NONAME
+	_ZNK11hspswrapper11CPluginInfo3UidEv @ 102 NONAME
+	_ZNK11hspswrapper11CPluginInfo4NameEv @ 103 NONAME
+	_ZNK11hspswrapper11CPluginInfo4TypeEv @ 104 NONAME
+	_ZNK11hspswrapper11CPluginInfo8LogoIconEv @ 105 NONAME
+	_ZNK11hspswrapper11CPluginInfo8MaxChildEv @ 106 NONAME
+	_ZNK11hspswrapper11CPluginInfo9InterfaceEv @ 107 NONAME
+	_ZNK11hspswrapper12CHspsWrapper11HspsServiceEv @ 108 NONAME
+	_ZNK11hspswrapper12CHspsWrapper13HspsInterfaceEv @ 109 NONAME
+	_ZNK11hspswrapper12CHspsWrapper14ServiceHandlerEv @ 110 NONAME
+	_ZNK11hspswrapper12CPropertyMap4NameEv @ 111 NONAME
+	_ZNK11hspswrapper12CPropertyMap5ValueEv @ 112 NONAME
+	_ZNK11hspswrapper16CAddPluginResult6StatusEv @ 113 NONAME
+	_ZNK11hspswrapper16CAddPluginResult8PluginIdEv @ 114 NONAME
+	_ZNK11hspswrapper18CHspsConfiguration6ConfIdEv @ 115 NONAME
+	_ZNK11hspswrapper8CItemMap10PropertiesEv @ 116 NONAME
+	_ZNK11hspswrapper8CItemMap6ItemIdEv @ 117 NONAME
+	_ZNK11hspswrapper8CItemMap8ItemNameEv @ 118 NONAME
+	_ZTIN11hspswrapper10CObjectMapE @ 119 NONAME
+	_ZTIN11hspswrapper10CPluginMapE @ 120 NONAME
+	_ZTIN11hspswrapper11CPluginInfoE @ 121 NONAME
+	_ZTIN11hspswrapper12CHspsWrapperE @ 122 NONAME
+	_ZTIN11hspswrapper12CPropertyMapE @ 123 NONAME
+	_ZTIN11hspswrapper16CAddPluginResultE @ 124 NONAME
+	_ZTIN11hspswrapper18CHspsConfigurationE @ 125 NONAME
+	_ZTIN11hspswrapper8CItemMapE @ 126 NONAME
+	_ZTVN11hspswrapper10CObjectMapE @ 127 NONAME
+	_ZTVN11hspswrapper10CPluginMapE @ 128 NONAME
+	_ZTVN11hspswrapper11CPluginInfoE @ 129 NONAME
+	_ZTVN11hspswrapper12CHspsWrapperE @ 130 NONAME
+	_ZTVN11hspswrapper12CPropertyMapE @ 131 NONAME
+	_ZTVN11hspswrapper16CAddPluginResultE @ 132 NONAME
+	_ZTVN11hspswrapper18CHspsConfigurationE @ 133 NONAME
+	_ZTVN11hspswrapper8CItemMapE @ 134 NONAME