diff -r fce0ae2e4223 -r 10852b179f64 supl/locationomasuplprotocolhandler/protocolhandler/eabi/eposomasuplprotocolhandleru.def
--- a/supl/locationomasuplprotocolhandler/protocolhandler/eabi/eposomasuplprotocolhandleru.def	Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/eabi/eposomasuplprotocolhandleru.def	Wed Sep 15 12:40:28 2010 +0300
@@ -3,54 +3,52 @@
 	_ZN16COMASuplSettings10ConstructLEv @ 2 NONAME
 	_ZN16COMASuplSettings10IsHslpNullEv @ 3 NONAME
 	_ZN16COMASuplSettings11SetUIActiveEi @ 4 NONAME
-	_ZN16COMASuplSettings12SetSUPLUsageERN13CSuplSettings18TSuplSettingsUsageE @ 5 NONAME
-	_ZN16COMASuplSettings14SetHSLPAddressERK7TDesC16 @ 6 NONAME
-	_ZN16COMASuplSettings19ConvertIAPNameToIdLERK7TDesC16Rm @ 7 NONAME
-	_ZN16COMASuplSettings22SetHSLPAddressFromIMSIERK7TDesC16 @ 8 NONAME
-	_ZN16COMASuplSettings4NewLEv @ 9 NONAME
-	_ZN16COMASuplSettings8SetIAPIdEi @ 10 NONAME
-	_ZN20COMASuplCommonConfig20ReadOMASuplSettingsLEv @ 11 NONAME
-	_ZN20COMASuplCommonConfig4NewLEv @ 12 NONAME
-	_ZN23COMASUPLProtocolManager11InitializeLEP25CSuplCommunicationManagerR14TRequestStatus @ 13 NONAME
-	_ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiiR16TSuplTerminalQopi @ 14 NONAME
-	_ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiii @ 15 NONAME
-	_ZN23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 16 NONAME
-	_ZN23COMASUPLProtocolManager14DestroySessionEP16CSuplSessionBase @ 17 NONAME
-	_ZN23COMASUPLProtocolManager15SetCommonConfigERP20COMASuplCommonConfig @ 18 NONAME
-	_ZN23COMASUPLProtocolManager16CancelInitializeEv @ 19 NONAME
-	_ZN23COMASUPLProtocolManager16CancelRunSessionEP16CSuplSessionBase @ 20 NONAME
-	_ZN23COMASUPLProtocolManager17CreateNewSessionLEN24CSUPLProtocolManagerBase12TSuplReqTypeEiN23RSuplTerminalSubSession16TSuplServiceTypeE @ 21 NONAME
-	_ZN23COMASUPLProtocolManager17HandlePacketErrorEi @ 22 NONAME
-	_ZN23COMASUPLProtocolManager18HandleSuplMessageLEP16CSuplSessionBaseR14TRequestStatusP6HBufC8 @ 23 NONAME
-	_ZN23COMASUPLProtocolManager19NotifyTriggerFiredLEP16CSuplSessionBaseR14TRequestStatusR20TSuplTriggerFireInfo @ 24 NONAME
-	_ZN23COMASUPLProtocolManager22GetSUPLMessageVersionLERiRK6TDesC8 @ 25 NONAME
-	_ZN23COMASUPLProtocolManager22RunSuplTriggerSessionLEP16CSuplSessionBaseR14TRequestStatusR28TSuplTerminalPeriodicTriggerRK7TDesC16iii @ 26 NONAME
-	_ZN23COMASUPLProtocolManager24CancelSuplTriggerSessionEP16CSuplSessionBase @ 27 NONAME
-	_ZN23COMASUPLProtocolManager30MakeLocationConversionRequestLEP16CSuplSessionBaseR12TGeoCellInfoR14TRequestStatus @ 28 NONAME
-	_ZN23COMASUPLProtocolManager31CancelLocationConversionRequestEP16CSuplSessionBase @ 29 NONAME
-	_ZN23COMASUPLProtocolManager4NewLEv @ 30 NONAME
-	_ZN23COMASUPLProtocolManagerC1Ev @ 31 NONAME
-	_ZN23COMASUPLProtocolManagerC2Ev @ 32 NONAME
-	_ZN23COMASUPLProtocolManagerD0Ev @ 33 NONAME
-	_ZN23COMASUPLProtocolManagerD1Ev @ 34 NONAME
-	_ZN23COMASUPLProtocolManagerD2Ev @ 35 NONAME
-	_ZNK16COMASuplSettings10IsUIActiveEv @ 36 NONAME
-	_ZNK16COMASuplSettings10SLPAddressEv @ 37 NONAME
-	_ZNK16COMASuplSettings18SLPAddressfromImsiEv @ 38 NONAME
-	_ZNK16COMASuplSettings5IAPIdEv @ 39 NONAME
-	_ZNK16COMASuplSettings9SUPLUsageEv @ 40 NONAME
-	_ZTI13COMASuplTrace @ 41 NONAME
-	_ZTI16COMASuplSettings @ 42 NONAME
-	_ZTI20COMASuplCommonConfig @ 43 NONAME
-	_ZTI20COMASuplDeInitilizer @ 44 NONAME
-	_ZTI23COMASUPLProtocolManager @ 45 NONAME
-	_ZTI26COMASuplInitilizeRequestor @ 46 NONAME
-	_ZTV13COMASuplTrace @ 47 NONAME
-	_ZTV16COMASuplSettings @ 48 NONAME
-	_ZTV20COMASuplCommonConfig @ 49 NONAME
-	_ZTV20COMASuplDeInitilizer @ 50 NONAME
-	_ZTV23COMASUPLProtocolManager @ 51 NONAME
-	_ZTV26COMASuplInitilizeRequestor @ 52 NONAME
-	_ZThn4_N23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 53 NONAME
-	_ZThn4_N23COMASUPLProtocolManager17HandlePacketErrorEi @ 54 NONAME
+	_ZN16COMASuplSettings14SetHSLPAddressERK7TDesC16 @ 5 NONAME
+	_ZN16COMASuplSettings19ConvertIAPNameToIdLERK7TDesC16Rm @ 6 NONAME
+	_ZN16COMASuplSettings22SetHSLPAddressFromIMSIERK7TDesC16 @ 7 NONAME
+	_ZN16COMASuplSettings4NewLEv @ 8 NONAME
+	_ZN16COMASuplSettings8SetIAPIdEi @ 9 NONAME
+	_ZN20COMASuplCommonConfig20ReadOMASuplSettingsLEv @ 10 NONAME
+	_ZN20COMASuplCommonConfig4NewLEv @ 11 NONAME
+	_ZN23COMASUPLProtocolManager11InitializeLEP25CSuplCommunicationManagerR14TRequestStatus @ 12 NONAME
+	_ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiiR16TSuplTerminalQopi @ 13 NONAME
+	_ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiii @ 14 NONAME
+	_ZN23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 15 NONAME
+	_ZN23COMASUPLProtocolManager14DestroySessionEP16CSuplSessionBase @ 16 NONAME
+	_ZN23COMASUPLProtocolManager15SetCommonConfigERP20COMASuplCommonConfig @ 17 NONAME
+	_ZN23COMASUPLProtocolManager16CancelInitializeEv @ 18 NONAME
+	_ZN23COMASUPLProtocolManager16CancelRunSessionEP16CSuplSessionBase @ 19 NONAME
+	_ZN23COMASUPLProtocolManager17CreateNewSessionLEN24CSUPLProtocolManagerBase12TSuplReqTypeEiN23RSuplTerminalSubSession16TSuplServiceTypeE @ 20 NONAME
+	_ZN23COMASUPLProtocolManager17HandlePacketErrorEi @ 21 NONAME
+	_ZN23COMASUPLProtocolManager18HandleSuplMessageLEP16CSuplSessionBaseR14TRequestStatusP6HBufC8 @ 22 NONAME
+	_ZN23COMASUPLProtocolManager19NotifyTriggerFiredLEP16CSuplSessionBaseR14TRequestStatusR20TSuplTriggerFireInfo @ 23 NONAME
+	_ZN23COMASUPLProtocolManager22GetSUPLMessageVersionLERiRK6TDesC8 @ 24 NONAME
+	_ZN23COMASUPLProtocolManager22RunSuplTriggerSessionLEP16CSuplSessionBaseR14TRequestStatusR28TSuplTerminalPeriodicTriggerRK7TDesC16iii @ 25 NONAME
+	_ZN23COMASUPLProtocolManager24CancelSuplTriggerSessionEP16CSuplSessionBase @ 26 NONAME
+	_ZN23COMASUPLProtocolManager30MakeLocationConversionRequestLEP16CSuplSessionBaseR12TGeoCellInfoR14TRequestStatus @ 27 NONAME
+	_ZN23COMASUPLProtocolManager31CancelLocationConversionRequestEP16CSuplSessionBase @ 28 NONAME
+	_ZN23COMASUPLProtocolManager4NewLEv @ 29 NONAME
+	_ZN23COMASUPLProtocolManagerC1Ev @ 30 NONAME
+	_ZN23COMASUPLProtocolManagerC2Ev @ 31 NONAME
+	_ZN23COMASUPLProtocolManagerD0Ev @ 32 NONAME
+	_ZN23COMASUPLProtocolManagerD1Ev @ 33 NONAME
+	_ZN23COMASUPLProtocolManagerD2Ev @ 34 NONAME
+	_ZNK16COMASuplSettings10IsUIActiveEv @ 35 NONAME
+	_ZNK16COMASuplSettings10SLPAddressEv @ 36 NONAME
+	_ZNK16COMASuplSettings18SLPAddressfromImsiEv @ 37 NONAME
+	_ZNK16COMASuplSettings5IAPIdEv @ 38 NONAME
+	_ZTI13COMASuplTrace @ 39 NONAME
+	_ZTI16COMASuplSettings @ 40 NONAME
+	_ZTI20COMASuplCommonConfig @ 41 NONAME
+	_ZTI20COMASuplDeInitilizer @ 42 NONAME
+	_ZTI23COMASUPLProtocolManager @ 43 NONAME
+	_ZTI26COMASuplInitilizeRequestor @ 44 NONAME
+	_ZTV13COMASuplTrace @ 45 NONAME
+	_ZTV16COMASuplSettings @ 46 NONAME
+	_ZTV20COMASuplCommonConfig @ 47 NONAME
+	_ZTV20COMASuplDeInitilizer @ 48 NONAME
+	_ZTV23COMASUPLProtocolManager @ 49 NONAME
+	_ZTV26COMASuplInitilizeRequestor @ 50 NONAME
+	_ZThn4_N23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 51 NONAME
+	_ZThn4_N23COMASUPLProtocolManager17HandlePacketErrorEi @ 52 NONAME