--- a/localconnectivityservice/dun/atext/src/DunAtCmdHandler.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/dun/atext/src/DunAtCmdHandler.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -488,17 +488,17 @@
}
if ( iVerboseOn )
{
- _LIT8( KVerboseError, "OK" );
+ _LIT8( KVerboseOk, "OK" );
iOkBuffer.Append( iCarriageReturn );
iOkBuffer.Append( iLineFeed );
- iOkBuffer.Append( KVerboseError );
+ iOkBuffer.Append( KVerboseOk );
iOkBuffer.Append( iCarriageReturn );
iOkBuffer.Append( iLineFeed );
}
else
{
- _LIT8( KNumericError, "4" );
- iOkBuffer.Append( KNumericError );
+ _LIT8( KNumericOk, "0" );
+ iOkBuffer.Append( KNumericOk );
iOkBuffer.Append( iCarriageReturn );
}
FTRACE(FPrint( _L("CDunAtCmdHandler::RegenerateOkReply() complete") ));
--- a/localconnectivityservice/generichid/tsrc/GenericHidTest/conf/GenericHidTest.cfg Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/generichid/tsrc/GenericHidTest/conf/GenericHidTest.cfg Sun Mar 14 13:12:17 2010 +0000
@@ -150,7 +150,7 @@
tester ExecuteBranchTestBlock DataIn BRANCH c:\data\others\play.hid
tester ExecuteBranchTestBlock Wait BRANCH 20
tester ExecuteBranchTestBlock AddAlarm BRANCH 1000
-tester ExecuteBranchTestBlock Wait BRANCH 80
+tester ExecuteBranchTestBlock Wait BRANCH 70
tester ExecuteBranchTestBlock DataIn BRANCH c:\data\others\hook.hid
tester ExecuteBranchTestBlock Wait BRANCH 20
tester ExecuteBranchTestBlock DataIn BRANCH c:\data\others\stop.hid
--- a/localconnectivityservice/lcstylustap/group/lcstylustap.mmp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/lcstylustap/group/lcstylustap.mmp Sun Mar 14 13:12:17 2010 +0000
@@ -67,7 +67,6 @@
LIBRARY cone.lib
LIBRARY commonengine.lib
LIBRARY efsrv.lib
-LIBRARY platformenv.lib
LIBRARY flogger.lib
--- a/localconnectivityservice/lcstylustap/src/lcstylustapdismount.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/lcstylustap/src/lcstylustapdismount.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -17,7 +17,6 @@
#include "debug.h"
#include "lcstylustapdismount.h"
-#include "driveinfo.h"
// ---------------------------------------------------------------------------
// Destructor.
@@ -126,15 +125,17 @@
//
void CLcStylusTapDismount::DoDismount()
{
- TRACE_FUNC
- TUint driveStatus( 0 );
-
+ TRACE_FUNC
+ TDriveInfo info;
+ TInt err = KErrNone;
for ( ; iDriveIndex < KMaxDrives; iDriveIndex++ )
{
if ( iDriveList[iDriveIndex] )
{
- DriveInfo::GetDriveStatus( iRFs, iDriveIndex, driveStatus );
- if ( driveStatus & DriveInfo::EDriveUsbMemory )
+ err = iRFs.Drive( info , iDriveIndex );
+ if ( info.iConnectionBusType == EConnectionBusUsb &&
+ info.iDriveAtt & KDriveAttExternal &&
+ err == KErrNone )
{
TRACE_INFO(_L("CLcStylusTapDismount::DoDismount Dismount notify request "));
iRFs.NotifyDismount( iDriveIndex, iStatus, EFsDismountNotifyClients );
--- a/localconnectivityservice/legacymodemplugin/src/proxy.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/legacymodemplugin/src/proxy.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -16,7 +16,7 @@
*/
#include <e32base.h>
-#include <ECom\ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
#include "legacymodemplugin.h"
// ---------------------------------------------------------------------------
--- a/localconnectivityservice/modematplugin/inc/atcopscmd.h Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/modematplugin/inc/atcopscmd.h Sun Mar 14 13:12:17 2010 +0000
@@ -21,7 +21,7 @@
#include <e32base.h>
#include <e32cmn.h>
-#include <RMmCustomAPI.h>
+#include <rmmcustomapi.h>
#include <etelpckt.h>
#include <etelmm.h>
#include <mmretrieve.h>
--- a/localconnectivityservice/modematplugin/src/atcopscmd.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/modematplugin/src/atcopscmd.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -16,7 +16,7 @@
*/
-#include <MmTsy_names.h>
+#include <mmtsy_names.h>
#include "atcopscmd.h"
#include "cmdpluginobserver.h"
#include "debug.h"
--- a/localconnectivityservice/modematplugin/src/proxy.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/modematplugin/src/proxy.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -20,7 +20,7 @@
#define REFERENCE_ATEXT_H
#include <e32base.h>
-#include <ECom\ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
#include "modematplugin.h"
// ---------------------------------------------------------------------------
--- a/localconnectivityservice/obexreceiveservices/bip/src/BIPController.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexreceiveservices/bip/src/BIPController.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -29,7 +29,7 @@
#include <obexutilsuilayer.h>
#include <obexutilsdialog.h>
#include <UiklafInternalCRKeys.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <sysutil.h>
#include <bautils.h>
#include <pathinfo.h> // provides interface for quering system paths
@@ -252,6 +252,17 @@
TRACE_FUNC_ENTRY
iLengthHeaderReceived = EFalse; // New put request so clear header based state
iBTTransferState = ETransferPut;
+
+ // Checking if backup is running now - if backup process is active, then we
+ // need to cancel transfer - otherwise phone will freeze during receiving
+ // data
+ if ( TObexUtilsUiLayer::IsBackupRunning() )
+ {
+ TRACE_INFO ( _L ("Backup in progress! Canceling incoming transfer."));
+ iBTTransferState = ETransferPutInitError;
+ return NULL;
+ }
+
TRAPD(err, HandlePutImageRequestL());
if (err == KErrNone)
{
--- a/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmui.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmui.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -27,7 +27,7 @@
#include <mtmuidef.hrh>
#include <mtclreg.h>
#include <obexutilsuilayer.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <msvuids.h>
#include <msvids.h>
#include <obexconstants.h>
--- a/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmuidata.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexreceiveservices/mtmuibluetooth/src/btmtmuidata.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -27,7 +27,7 @@
#include <mtmuidsdef.hrh> //kuidmtmquerymaxbodysizevalue etc
#endif
#include <msvuids.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <obexutilsmessagehandler.h>
--- a/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmui.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -27,7 +27,7 @@
#include <mtmuidef.hrh>
#include <mtclreg.h>
#include <obexutilsuilayer.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <msvuids.h>
#include <msvids.h>
#include <obexconstants.h>
--- a/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmuidata.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexreceiveservices/mtmuiinfrared/src/irmtmuidata.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -29,7 +29,7 @@
#include <mtmdef.hrh> //kuidmtmquerymaxbodysizevalue etc
#include <mtmuidsdef.hrh> //kuidmtmquerymaxbodysizevalue etc
#endif
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <MtmExtendedCapabilities.hrh>
#include <obexutilsmessagehandler.h>
#include "debug.h"
--- a/localconnectivityservice/obexreceiveservices/opp/src/oppcontroller.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexreceiveservices/opp/src/oppcontroller.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -22,7 +22,7 @@
#include "btengdevman.h"
#include <obexutilsmessagehandler.h>
#include "debug.h"
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <bautils.h>
#include <UiklafInternalCRKeys.h>
#include <obexutilsuilayer.h>
@@ -221,6 +221,17 @@
TRACE_FUNC
iLengthHeaderReceived = EFalse; // New put request so clear header based state
iObexTransferState = ETransferPut;
+
+ // Checking if backup is running now - if backup process is active, then we
+ // need to cancel transfer - otherwise phone will freeze during receiving
+ // data
+ if ( TObexUtilsUiLayer::IsBackupRunning() )
+ {
+ TRACE_INFO ( _L ("Backup in progress! Canceling incoming transfer."));
+ iObexTransferState = ETransferPutInitError;
+ return NULL;
+ }
+
TRAPD(err, HandlePutRequestL());
if(err == KErrNone)
{
--- a/localconnectivityservice/obexsendservices/group/bld.inf Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexsendservices/group/bld.inf Sun Mar 14 13:12:17 2010 +0000
@@ -24,7 +24,7 @@
PRJ_EXPORTS
../obexservicesendutils/inc/BTServiceAPI.h |../../inc/btserviceapi.h
-../obexservicesendutils/inc/BTServiceParameterList.h |../../inc/btserviceparameterlist.h
+../obexservicesendutils/inc/BTServiceParameterList.h |../../inc/BTServiceParameterList.h
../rom/obexservicebtsend.iby CORE_MW_LAYER_IBY_EXPORT_PATH(obexservicebtsend.iby)
../rom/obexserviceirsend.iby CORE_MW_LAYER_IBY_EXPORT_PATH(obexserviceirsend.iby)
../rom/obexservicesendutils.iby CORE_MW_LAYER_IBY_EXPORT_PATH(obexservicesendutils.iby)
--- a/localconnectivityservice/obexsendservices/obexserviceirsend/src/IRClient.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexsendservices/obexserviceirsend/src/IRClient.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <obexclient.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <obexutilsuilayer.h>
#include "IRClient.h"
--- a/localconnectivityservice/obexsendservices/obexserviceirsend/src/IRSSProvider.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexsendservices/obexserviceirsend/src/IRSSProvider.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -21,7 +21,7 @@
#include <AiwCommon.hrh>
#include <AiwMenu.h>
-#include <IRSSMenu.rsg>
+#include <irssmenu.rsg>
#include <btnotif.h> // Notifier UID's
#include <aknnotewrappers.h> //For notifier
#include <featmgr.h>
--- a/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBIPController.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBIPController.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -22,7 +22,7 @@
#include "BTSUDebug.h"
#include "BTSUImageConverter.h"
#include "BTSUXmlParser.h"
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
--- a/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBPPController.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBPPController.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -23,7 +23,7 @@
#include "BTSUDebug.h"
#include <obexheaders.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <obexutilsuilayer.h>
// CONSTANTS
--- a/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTServiceStarter.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTServiceStarter.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -24,7 +24,7 @@
#include "BTSBIPController.h"
#include "BTSBPPController.h"
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <obexutilsuilayer.h>
#include <obexutilsmessagehandler.h>
#include <btnotif.h>
--- a/localconnectivityservice/obexserviceman/utils/bwins/OBEXUTILSU.DEF Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexserviceman/utils/bwins/OBEXUTILSU.DEF Sun Mar 14 13:12:17 2010 +0000
@@ -1,61 +1,62 @@
EXPORTS
- ??0CObexUtilsOpaqueData@@QAE@ABVTDesC8@@@Z @ 1 NONAME ; CObexUtilsOpaqueData::CObexUtilsOpaqueData(class TDesC8 const &)
- ?CancelProgressDialogL@CObexUtilsDialog@@QAEXXZ @ 2 NONAME ; void CObexUtilsDialog::CancelProgressDialogL(void)
- ?CancelWaitDialogL@CObexUtilsDialog@@QAEXXZ @ 3 NONAME ; void CObexUtilsDialog::CancelWaitDialogL(void)
- ?ContextIcon@TObexUtilsUiLayer@@SAHABVTMsvEntry@@W4TContextMedia@@@Z @ 4 NONAME ; int TObexUtilsUiLayer::ContextIcon(class TMsvEntry const &, enum TContextMedia)
- ?CreateDefaultMtmServiceL@TObexUtilsMessageHandler@@SAXVTUid@@@Z @ 5 NONAME ; void TObexUtilsMessageHandler::CreateDefaultMtmServiceL(class TUid)
- ?CreateIconsL@TObexUtilsUiLayer@@SAXVTUid@@PAV?$CArrayPtr@V?$CArrayPtr@VCFbsBitmap@@@@@@@Z @ 6 NONAME ; void TObexUtilsUiLayer::CreateIconsL(class TUid, class CArrayPtr<class CArrayPtr<class CFbsBitmap> > *)
- ?CreateInboxAttachmentL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAVRFile@@@Z @ 7 NONAME ; void TObexUtilsMessageHandler::CreateInboxAttachmentL(class CObexBufObject * &, class TUid, long &, class RFile &)
- ?CreateOutboxEntryL@TObexUtilsMessageHandler@@SAJABVTUid@@ABH@Z @ 8 NONAME ; long TObexUtilsMessageHandler::CreateOutboxEntryL(class TUid const &, int const &)
- ?DeleteOutboxEntryL@TObexUtilsMessageHandler@@SAXABJ@Z @ 9 NONAME ; void TObexUtilsMessageHandler::DeleteOutboxEntryL(long const &)
- ?GetCenRepKeyIntValueL@TObexUtilsMessageHandler@@SAHVTUid@@KAAH@Z @ 10 NONAME ; int TObexUtilsMessageHandler::GetCenRepKeyIntValueL(class TUid, unsigned long, int &)
- ?GetFileSystemStatus@TObexUtilsMessageHandler@@SAHXZ @ 11 NONAME ; int TObexUtilsMessageHandler::GetFileSystemStatus(void)
- ?GetMessageCentreDriveL@TObexUtilsMessageHandler@@SAHXZ @ 12 NONAME ; int TObexUtilsMessageHandler::GetMessageCentreDriveL(void)
+ ?ReadResourceL@TObexUtilsUiLayer@@SAXAAVTDes16@@ABH@Z @ 1 NONAME ; void TObexUtilsUiLayer::ReadResourceL(class TDes16 &, int const &)
+ ?SaveObjToInboxL@TObexUtilsMessageHandler@@SAXPAVCObexBufObject@@ABVTDesC16@@VTUid@@@Z @ 2 NONAME ; void TObexUtilsMessageHandler::SaveObjToInboxL(class CObexBufObject *, class TDesC16 const &, class TUid)
+ ?RemoveInboxEntriesL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@J@Z @ 3 NONAME ; void TObexUtilsMessageHandler::RemoveInboxEntriesL(class CObexBufObject * &, long)
+ ?GetNumber@CObexUtilsOpaqueData@@QAEHAAI@Z @ 4 NONAME ; int CObexUtilsOpaqueData::GetNumber(unsigned int &)
+ ??0CObexUtilsOpaqueData@@QAE@ABVTDesC8@@@Z @ 5 NONAME ; CObexUtilsOpaqueData::CObexUtilsOpaqueData(class TDesC8 const &)
+ ?UpdateProgressDialog@CGlobalProgressDialog@@QAEXHH@Z @ 6 NONAME ; void CGlobalProgressDialog::UpdateProgressDialog(int, int)
+ ?AddEntryToInboxL@TObexUtilsMessageHandler@@SAXAAJAAV?$TBuf@$0BAA@@@@Z @ 7 NONAME ; void TObexUtilsMessageHandler::AddEntryToInboxL(long &, class TBuf<256> &)
+ ?CancelWaitDialogL@CObexUtilsDialog@@QAEXXZ @ 8 NONAME ; void CObexUtilsDialog::CancelWaitDialogL(void)
+ ?LaunchFileManagerL@TObexUtilsUiLayer@@SAXAAVTDesC16@@HH@Z @ 9 NONAME ; void TObexUtilsUiLayer::LaunchFileManagerL(class TDesC16 &, int, int)
+ ?CreateDefaultMtmServiceL@TObexUtilsMessageHandler@@SAXVTUid@@@Z @ 10 NONAME ; void TObexUtilsMessageHandler::CreateDefaultMtmServiceL(class TUid)
+ ?UpdateProgressDialogL@CObexUtilsDialog@@QAEXHH@Z @ 11 NONAME ; void CObexUtilsDialog::UpdateProgressDialogL(int, int)
+ ?GetCenRepKeyStringValueL@TObexUtilsMessageHandler@@SAHVTUid@@KAAVTDes16@@@Z @ 12 NONAME ; int TObexUtilsMessageHandler::GetCenRepKeyStringValueL(class TUid, unsigned long, class TDes16 &)
?GetMmcFileSystemStatus@TObexUtilsMessageHandler@@SAHXZ @ 13 NONAME ; int TObexUtilsMessageHandler::GetMmcFileSystemStatus(void)
- ?GetNumber@CObexUtilsOpaqueData@@QAEHAAI@Z @ 14 NONAME ; int CObexUtilsOpaqueData::GetNumber(unsigned int &)
- ?GetPubSubKeyIntValue@TObexUtilsMessageHandler@@SAHVTUid@@IAAH@Z @ 15 NONAME ; int TObexUtilsMessageHandler::GetPubSubKeyIntValue(class TUid, unsigned int, int &)
- ?GetString@CObexUtilsOpaqueData@@QAEHAAV?$TBuf8@$0BAA@@@@Z @ 16 NONAME ; int CObexUtilsOpaqueData::GetString(class TBuf8<256> &)
- ?IsString@CObexUtilsOpaqueData@@QAEHXZ @ 17 NONAME ; int CObexUtilsOpaqueData::IsString(void)
- ?LaunchEditorApplicationL@TObexUtilsUiLayer@@SAHPAVCMsvEntry@@AAVCMsvSession@@@Z @ 18 NONAME ; int TObexUtilsUiLayer::LaunchEditorApplicationL(class CMsvEntry *, class CMsvSession &)
- ?LaunchEditorApplicationOperationL@TObexUtilsUiLayer@@SAPAVCMsvOperation@@AAVCMsvSession@@PAVCMsvEntry@@AAVTRequestStatus@@@Z @ 19 NONAME ; class CMsvOperation * TObexUtilsUiLayer::LaunchEditorApplicationOperationL(class CMsvSession &, class CMsvEntry *, class TRequestStatus &)
- ?LaunchProgressDialogL@CObexUtilsDialog@@QAEXPAVMObexUtilsProgressObserver@@HHH@Z @ 20 NONAME ; void CObexUtilsDialog::LaunchProgressDialogL(class MObexUtilsProgressObserver *, int, int, int)
- ?LaunchQueryDialogL@CObexUtilsDialog@@QAEHABH@Z @ 21 NONAME ; int CObexUtilsDialog::LaunchQueryDialogL(int const &)
- ?LaunchWaitDialogL@CObexUtilsDialog@@QAEXH@Z @ 22 NONAME ; void CObexUtilsDialog::LaunchWaitDialogL(int)
- ?NewL@CGlobalDialog@@SAPAV1@PAVMGlobalNoteCallback@@@Z @ 23 NONAME ; class CGlobalDialog * CGlobalDialog::NewL(class MGlobalNoteCallback *)
- ?NewL@CGlobalProgressDialog@@SAPAV1@PAVMGlobalProgressCallback@@@Z @ 24 NONAME ; class CGlobalProgressDialog * CGlobalProgressDialog::NewL(class MGlobalProgressCallback *)
- ?NewL@CObexUtilsDialog@@SAPAV1@PAVMObexUtilsDialogObserver@@@Z @ 25 NONAME ; class CObexUtilsDialog * CObexUtilsDialog::NewL(class MObexUtilsDialogObserver *)
- ?NewL@CObexUtilsPropertyNotifier@@SAPAV1@PAVMObexUtilsPropertyNotifyHandler@@W4TMemoryPropertyCheckType@@@Z @ 26 NONAME ; class CObexUtilsPropertyNotifier * CObexUtilsPropertyNotifier::NewL(class MObexUtilsPropertyNotifyHandler *, enum TMemoryPropertyCheckType)
- ?NewLC@CGlobalDialog@@SAPAV1@PAVMGlobalNoteCallback@@@Z @ 27 NONAME ; class CGlobalDialog * CGlobalDialog::NewLC(class MGlobalNoteCallback *)
- ?NewLC@CGlobalProgressDialog@@SAPAV1@PAVMGlobalProgressCallback@@@Z @ 28 NONAME ; class CGlobalProgressDialog * CGlobalProgressDialog::NewLC(class MGlobalProgressCallback *)
- ?NewLC@CObexUtilsDialog@@SAPAV1@PAVMObexUtilsDialogObserver@@@Z @ 29 NONAME ; class CObexUtilsDialog * CObexUtilsDialog::NewLC(class MObexUtilsDialogObserver *)
- ?OperationNotSupported@TObexUtilsUiLayer@@SAHXZ @ 30 NONAME ; int TObexUtilsUiLayer::OperationNotSupported(void)
- ?ProcessFinished@CGlobalDialog@@QAEXXZ @ 31 NONAME ; void CGlobalDialog::ProcessFinished(void)
- ?ProcessFinished@CGlobalProgressDialog@@QAEXXZ @ 32 NONAME ; void CGlobalProgressDialog::ProcessFinished(void)
- ?ReadResourceL@TObexUtilsUiLayer@@SAXAAVTDes16@@ABH@Z @ 33 NONAME ; void TObexUtilsUiLayer::ReadResourceL(class TDes16 &, int const &)
- ?RemoveInboxEntriesL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@J@Z @ 34 NONAME ; void TObexUtilsMessageHandler::RemoveInboxEntriesL(class CObexBufObject * &, long)
- ?SaveObjToInboxL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@AAVRFile@@J@Z @ 35 NONAME ; void TObexUtilsMessageHandler::SaveObjToInboxL(class CObexBufObject * &, class RFile &, long)
- ?SaveObjToInboxL@TObexUtilsMessageHandler@@SAXPAVCObexBufObject@@ABVTDesC16@@VTUid@@@Z @ 36 NONAME ; void TObexUtilsMessageHandler::SaveObjToInboxL(class CObexBufObject *, class TDesC16 const &, class TUid)
- ?ShowErrorDialogL@CGlobalDialog@@QAEXH@Z @ 37 NONAME ; void CGlobalDialog::ShowErrorDialogL(int)
- ?ShowErrorNoteL@TObexUtilsUiLayer@@SAXABH@Z @ 38 NONAME ; void TObexUtilsUiLayer::ShowErrorNoteL(int const &)
- ?ShowGlobalConfirmationQueryL@TObexUtilsUiLayer@@SAXABH@Z @ 39 NONAME ; void TObexUtilsUiLayer::ShowGlobalConfirmationQueryL(int const &)
- ?ShowInformationNoteL@TObexUtilsUiLayer@@SAXABH@Z @ 40 NONAME ; void TObexUtilsUiLayer::ShowInformationNoteL(int const &)
- ?ShowNoteDialogL@CGlobalDialog@@QAEXHH@Z @ 41 NONAME ; void CGlobalDialog::ShowNoteDialogL(int, int)
+ ?GetPubSubKeyIntValue@TObexUtilsMessageHandler@@SAHVTUid@@IAAH@Z @ 14 NONAME ; int TObexUtilsMessageHandler::GetPubSubKeyIntValue(class TUid, unsigned int, int &)
+ ?IsBackupRunning@TObexUtilsUiLayer@@SAHXZ @ 15 NONAME ; int TObexUtilsUiLayer::IsBackupRunning(void)
+ ?CancelProgressDialogL@CObexUtilsDialog@@QAEXXZ @ 16 NONAME ; void CObexUtilsDialog::CancelProgressDialogL(void)
+ ?ProcessFinished@CGlobalProgressDialog@@QAEXXZ @ 17 NONAME ; void CGlobalProgressDialog::ProcessFinished(void)
+ ?AddEntryToInboxL@TObexUtilsMessageHandler@@SAXAAJAAV?$TBuf@$0BAA@@@PAV?$RArray@J@@@Z @ 18 NONAME ; void TObexUtilsMessageHandler::AddEntryToInboxL(long &, class TBuf<256> &, class RArray<long> *)
+ ?CreateIconsL@TObexUtilsUiLayer@@SAXVTUid@@PAV?$CArrayPtr@V?$CArrayPtr@VCFbsBitmap@@@@@@@Z @ 19 NONAME ; void TObexUtilsUiLayer::CreateIconsL(class TUid, class CArrayPtr<class CArrayPtr<class CFbsBitmap> > *)
+ ?ShowProgressDialogNameSizeL@CGlobalProgressDialog@@QAEXAAVTDesC16@@_J@Z @ 20 NONAME ; void CGlobalProgressDialog::ShowProgressDialogNameSizeL(class TDesC16 &, long long)
+ ?GetFileSystemStatus@TObexUtilsMessageHandler@@SAHXZ @ 21 NONAME ; int TObexUtilsMessageHandler::GetFileSystemStatus(void)
+ ?NewL@CObexUtilsDialog@@SAPAV1@PAVMObexUtilsDialogObserver@@@Z @ 22 NONAME ; class CObexUtilsDialog * CObexUtilsDialog::NewL(class MObexUtilsDialogObserver *)
+ ?LaunchQueryDialogL@CObexUtilsDialog@@QAEHABH@Z @ 23 NONAME ; int CObexUtilsDialog::LaunchQueryDialogL(int const &)
+ ?CreateOutboxEntryL@TObexUtilsMessageHandler@@SAJABVTUid@@ABH@Z @ 24 NONAME ; long TObexUtilsMessageHandler::CreateOutboxEntryL(class TUid const &, int const &)
+ ?ShowGlobalConfirmationQueryL@TObexUtilsUiLayer@@SAXABH@Z @ 25 NONAME ; void TObexUtilsUiLayer::ShowGlobalConfirmationQueryL(int const &)
+ ?CreateInboxAttachmentL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAVRFile@@@Z @ 26 NONAME ; void TObexUtilsMessageHandler::CreateInboxAttachmentL(class CObexBufObject * &, class TUid, long &, class RFile &)
+ ?GetMessageCentreDriveL@TObexUtilsMessageHandler@@SAHXZ @ 27 NONAME ; int TObexUtilsMessageHandler::GetMessageCentreDriveL(void)
+ ?LaunchEditorApplicationL@TObexUtilsUiLayer@@SAXAAJ@Z @ 28 NONAME ; void TObexUtilsUiLayer::LaunchEditorApplicationL(long &)
+ ?GetCenRepKeyIntValueL@TObexUtilsMessageHandler@@SAHVTUid@@KAAH@Z @ 29 NONAME ; int TObexUtilsMessageHandler::GetCenRepKeyIntValueL(class TUid, unsigned long, int &)
+ ?LaunchWaitDialogL@CObexUtilsDialog@@QAEXH@Z @ 30 NONAME ; void CObexUtilsDialog::LaunchWaitDialogL(int)
+ ?ShowNoteDialogL@CGlobalDialog@@QAEXHH@Z @ 31 NONAME ; void CGlobalDialog::ShowNoteDialogL(int, int)
+ ?ShowGlobalConfirmationQueryPlainL@TObexUtilsUiLayer@@SAHABH@Z @ 32 NONAME ; int TObexUtilsUiLayer::ShowGlobalConfirmationQueryPlainL(int const &)
+ ?NewLC@CGlobalProgressDialog@@SAPAV1@PAVMGlobalProgressCallback@@@Z @ 33 NONAME ; class CGlobalProgressDialog * CGlobalProgressDialog::NewLC(class MGlobalProgressCallback *)
+ ?IsString@CObexUtilsOpaqueData@@QAEHXZ @ 34 NONAME ; int CObexUtilsOpaqueData::IsString(void)
+ ?CreateReceiveBufferAndRFileL@TObexUtilsMessageHandler@@SAHAAVRFile@@ABVTDesC16@@AAV?$TBuf@$0BAA@@@AAPAVCBufFlat@@H@Z @ 35 NONAME ; int TObexUtilsMessageHandler::CreateReceiveBufferAndRFileL(class RFile &, class TDesC16 const &, class TBuf<256> &, class CBufFlat * &, int)
+ ?LaunchEditorApplicationOperationL@TObexUtilsUiLayer@@SAPAVCMsvOperation@@AAVCMsvSession@@PAVCMsvEntry@@AAVTRequestStatus@@@Z @ 36 NONAME ; class CMsvOperation * TObexUtilsUiLayer::LaunchEditorApplicationOperationL(class CMsvSession &, class CMsvEntry *, class TRequestStatus &)
+ ?OperationNotSupported@TObexUtilsUiLayer@@SAHXZ @ 37 NONAME ; int TObexUtilsUiLayer::OperationNotSupported(void)
+ ?ProcessFinished@CGlobalDialog@@QAEXXZ @ 38 NONAME ; void CGlobalDialog::ProcessFinished(void)
+ ?UpdateBitmaps@TObexUtilsUiLayer@@SAXVTUid@@AAHAAV?$TBuf@$0BAA@@@11@Z @ 39 NONAME ; void TObexUtilsUiLayer::UpdateBitmaps(class TUid, int &, class TBuf<256> &, int &, int &)
+ ?ShowErrorDialogL@CGlobalDialog@@QAEXH@Z @ 40 NONAME ; void CGlobalDialog::ShowErrorDialogL(int)
+ ?ShowProgressDialogL@CGlobalProgressDialog@@QAEXH@Z @ 41 NONAME ; void CGlobalProgressDialog::ShowProgressDialogL(int)
?ShowNumberOfSendFileL@CObexUtilsDialog@@QAEXHH@Z @ 42 NONAME ; void CObexUtilsDialog::ShowNumberOfSendFileL(int, int)
- ?ShowProgressDialogL@CGlobalProgressDialog@@QAEXH@Z @ 43 NONAME ; void CGlobalProgressDialog::ShowProgressDialogL(int)
- ?UpdateBitmaps@TObexUtilsUiLayer@@SAXVTUid@@AAHAAV?$TBuf@$0BAA@@@11@Z @ 44 NONAME ; void TObexUtilsUiLayer::UpdateBitmaps(class TUid, int &, class TBuf<256> &, int &, int &)
- ?UpdateProgressDialog@CGlobalProgressDialog@@QAEXHH@Z @ 45 NONAME ; void CGlobalProgressDialog::UpdateProgressDialog(int, int)
- ?UpdateProgressDialogL@CObexUtilsDialog@@QAEXHH@Z @ 46 NONAME ; void CObexUtilsDialog::UpdateProgressDialogL(int, int)
- ?ShowGlobalFileOpenConfirmationQueryL@TObexUtilsUiLayer@@SAHABHABVTDesC16@@@Z @ 47 NONAME ; int TObexUtilsUiLayer::ShowGlobalFileOpenConfirmationQueryL(int const &, class TDesC16 const &)
- ?GetCenRepKeyStringValueL@TObexUtilsMessageHandler@@SAHVTUid@@KAAVTDes16@@@Z @ 48 NONAME ; int TObexUtilsMessageHandler::GetCenRepKeyStringValueL(class TUid, unsigned long, class TDes16 &)
- ?LaunchEditorApplicationL@TObexUtilsUiLayer@@SAXAAJ@Z @ 49 NONAME ; void TObexUtilsUiLayer::LaunchEditorApplicationL(long &)
- ?AddEntryToInboxL@TObexUtilsMessageHandler@@SAXAAJAAV?$TBuf@$0BAA@@@PAV?$RArray@J@@@Z @ 50 NONAME ; void TObexUtilsMessageHandler::AddEntryToInboxL(long &, class TBuf<256> &, class RArray<long> *)
- ?ShowProgressDialogNameSizeL@CGlobalProgressDialog@@QAEXAAVTDesC16@@_J@Z @ 51 NONAME ; void CGlobalProgressDialog::ShowProgressDialogNameSizeL(class TDesC16 &, long long)
- ?ShowGlobalConfirmationQueryPlainL@TObexUtilsUiLayer@@SAHABH@Z @ 52 NONAME ; int TObexUtilsUiLayer::ShowGlobalConfirmationQueryPlainL(int const &)
- ?CreateReceiveBufferAndRFileL@TObexUtilsMessageHandler@@SAHAAVRFile@@ABVTDesC16@@AAV?$TBuf@$0BAA@@@AAPAVCBufFlat@@H@Z @ 53 NONAME ; int TObexUtilsMessageHandler::CreateReceiveBufferAndRFileL(class RFile &, class TDesC16 const &, class TBuf<256> &, class CBufFlat * &, int)
- ?UpdateEntryAttachmentL@TObexUtilsMessageHandler@@SAXAAV?$TBuf@$0BAA@@@PAVCMsvEntry@@@Z @ 54 NONAME ; void TObexUtilsMessageHandler::UpdateEntryAttachmentL(class TBuf<256> &, class CMsvEntry *)
- ?CreateInboxAttachmentL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAVRFile@@ABVTDesC16@@@Z @ 55 NONAME ; void TObexUtilsMessageHandler::CreateInboxAttachmentL(class CObexBufObject * &, class TUid, long &, class RFile &, class TDesC16 const &)
- ?RemoveTemporaryRFileL@TObexUtilsMessageHandler@@SAXABV?$TBuf@$0BAA@@@@Z @ 56 NONAME ; void TObexUtilsMessageHandler::RemoveTemporaryRFileL(class TBuf<256> const &)
- ?LaunchFileManagerL@TObexUtilsUiLayer@@SAXAAVTDesC16@@HH@Z @ 57 NONAME ; void TObexUtilsUiLayer::LaunchFileManagerL(class TDesC16 &, int, int)
- ?SaveFileToFileSystemL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAV?$TBuf@$0BAA@@@AAVRFile@@ABVTDesC16@@@Z @ 58 NONAME ; void TObexUtilsMessageHandler::SaveFileToFileSystemL(class CObexBufObject * &, class TUid, long &, class TBuf<256> &, class RFile &, class TDesC16 const &)
- ?AddEntryToInboxL@TObexUtilsMessageHandler@@SAXAAJAAV?$TBuf@$0BAA@@@@Z @ 59 NONAME ; void TObexUtilsMessageHandler::AddEntryToInboxL(long &, class TBuf<256> &)
+ ?ShowErrorNoteL@TObexUtilsUiLayer@@SAXABH@Z @ 43 NONAME ; void TObexUtilsUiLayer::ShowErrorNoteL(int const &)
+ ?NewL@CObexUtilsPropertyNotifier@@SAPAV1@PAVMObexUtilsPropertyNotifyHandler@@W4TMemoryPropertyCheckType@@@Z @ 44 NONAME ; class CObexUtilsPropertyNotifier * CObexUtilsPropertyNotifier::NewL(class MObexUtilsPropertyNotifyHandler *, enum TMemoryPropertyCheckType)
+ ?ShowGlobalFileOpenConfirmationQueryL@TObexUtilsUiLayer@@SAHABHABVTDesC16@@@Z @ 45 NONAME ; int TObexUtilsUiLayer::ShowGlobalFileOpenConfirmationQueryL(int const &, class TDesC16 const &)
+ ?GetString@CObexUtilsOpaqueData@@QAEHAAV?$TBuf8@$0BAA@@@@Z @ 46 NONAME ; int CObexUtilsOpaqueData::GetString(class TBuf8<256> &)
+ ?UpdateEntryAttachmentL@TObexUtilsMessageHandler@@SAXAAV?$TBuf@$0BAA@@@PAVCMsvEntry@@@Z @ 47 NONAME ; void TObexUtilsMessageHandler::UpdateEntryAttachmentL(class TBuf<256> &, class CMsvEntry *)
+ ?NewL@CGlobalDialog@@SAPAV1@PAVMGlobalNoteCallback@@@Z @ 48 NONAME ; class CGlobalDialog * CGlobalDialog::NewL(class MGlobalNoteCallback *)
+ ?CreateInboxAttachmentL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAVRFile@@ABVTDesC16@@@Z @ 49 NONAME ; void TObexUtilsMessageHandler::CreateInboxAttachmentL(class CObexBufObject * &, class TUid, long &, class RFile &, class TDesC16 const &)
+ ?NewL@CGlobalProgressDialog@@SAPAV1@PAVMGlobalProgressCallback@@@Z @ 50 NONAME ; class CGlobalProgressDialog * CGlobalProgressDialog::NewL(class MGlobalProgressCallback *)
+ ?RemoveTemporaryRFileL@TObexUtilsMessageHandler@@SAXABV?$TBuf@$0BAA@@@@Z @ 51 NONAME ; void TObexUtilsMessageHandler::RemoveTemporaryRFileL(class TBuf<256> const &)
+ ?LaunchProgressDialogL@CObexUtilsDialog@@QAEXPAVMObexUtilsProgressObserver@@HHH@Z @ 52 NONAME ; void CObexUtilsDialog::LaunchProgressDialogL(class MObexUtilsProgressObserver *, int, int, int)
+ ?DeleteOutboxEntryL@TObexUtilsMessageHandler@@SAXABJ@Z @ 53 NONAME ; void TObexUtilsMessageHandler::DeleteOutboxEntryL(long const &)
+ ?ContextIcon@TObexUtilsUiLayer@@SAHABVTMsvEntry@@W4TContextMedia@@@Z @ 54 NONAME ; int TObexUtilsUiLayer::ContextIcon(class TMsvEntry const &, enum TContextMedia)
+ ?SaveFileToFileSystemL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@VTUid@@AAJAAV?$TBuf@$0BAA@@@AAVRFile@@ABVTDesC16@@@Z @ 55 NONAME ; void TObexUtilsMessageHandler::SaveFileToFileSystemL(class CObexBufObject * &, class TUid, long &, class TBuf<256> &, class RFile &, class TDesC16 const &)
+ ?ShowInformationNoteL@TObexUtilsUiLayer@@SAXABH@Z @ 56 NONAME ; void TObexUtilsUiLayer::ShowInformationNoteL(int const &)
+ ?NewLC@CObexUtilsDialog@@SAPAV1@PAVMObexUtilsDialogObserver@@@Z @ 57 NONAME ; class CObexUtilsDialog * CObexUtilsDialog::NewLC(class MObexUtilsDialogObserver *)
+ ?LaunchEditorApplicationL@TObexUtilsUiLayer@@SAHPAVCMsvEntry@@AAVCMsvSession@@@Z @ 58 NONAME ; int TObexUtilsUiLayer::LaunchEditorApplicationL(class CMsvEntry *, class CMsvSession &)
+ ?SaveObjToInboxL@TObexUtilsMessageHandler@@SAXAAPAVCObexBufObject@@AAVRFile@@J@Z @ 59 NONAME ; void TObexUtilsMessageHandler::SaveObjToInboxL(class CObexBufObject * &, class RFile &, long)
+ ?NewLC@CGlobalDialog@@SAPAV1@PAVMGlobalNoteCallback@@@Z @ 60 NONAME ; class CGlobalDialog * CGlobalDialog::NewLC(class MGlobalNoteCallback *)
--- a/localconnectivityservice/obexserviceman/utils/eabi/obexutilsu.DEF Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexserviceman/utils/eabi/obexutilsu.DEF Sun Mar 14 13:12:17 2010 +0000
@@ -1,63 +1,63 @@
EXPORTS
- _ZN16CObexUtilsDialog17CancelWaitDialogLEv @ 1 NONAME
- _ZN16CObexUtilsDialog17LaunchWaitDialogLEi @ 2 NONAME
- _ZN16CObexUtilsDialog21CancelProgressDialogLEv @ 3 NONAME
- _ZN16CObexUtilsDialog21LaunchProgressDialogLEP26MObexUtilsProgressObserveriii @ 4 NONAME
- _ZN16CObexUtilsDialog21UpdateProgressDialogLEii @ 5 NONAME
- _ZN16CObexUtilsDialog4NewLEP24MObexUtilsDialogObserver @ 6 NONAME
- _ZN16CObexUtilsDialog5NewLCEP24MObexUtilsDialogObserver @ 7 NONAME
- _ZN17TObexUtilsUiLayer11ContextIconERK9TMsvEntry13TContextMedia @ 8 NONAME
- _ZN17TObexUtilsUiLayer13ReadResourceLER6TDes16RKi @ 9 NONAME
- _ZN17TObexUtilsUiLayer13UpdateBitmapsE4TUidRiR4TBufILi256EES1_S1_ @ 10 NONAME
- _ZN17TObexUtilsUiLayer14ShowErrorNoteLERKi @ 11 NONAME
- _ZN17TObexUtilsUiLayer20ShowInformationNoteLERKi @ 12 NONAME
- _ZN17TObexUtilsUiLayer21OperationNotSupportedEv @ 13 NONAME
- _ZN17TObexUtilsUiLayer24LaunchEditorApplicationLEP9CMsvEntryR11CMsvSession @ 14 NONAME
- _ZN24TObexUtilsMessageHandler15SaveObjToInboxLERP14CObexBufObjectR5RFilel @ 15 NONAME
- _ZN24TObexUtilsMessageHandler18CreateOutboxEntryLERK4TUidRKi @ 16 NONAME
- _ZN24TObexUtilsMessageHandler18DeleteOutboxEntryLERKl @ 17 NONAME
- _ZN24TObexUtilsMessageHandler19GetFileSystemStatusEv @ 18 NONAME
- _ZN24TObexUtilsMessageHandler22GetMmcFileSystemStatusEv @ 19 NONAME
- _ZN21CGlobalProgressDialog27ShowProgressDialogNameSizeLER7TDesC16x @ 20 NONAME
+ _ZN13CGlobalDialog15ProcessFinishedEv @ 1 NONAME
+ _ZN13CGlobalDialog15ShowNoteDialogLEii @ 2 NONAME
+ _ZN13CGlobalDialog16ShowErrorDialogLEi @ 3 NONAME
+ _ZN13CGlobalDialog4NewLEP19MGlobalNoteCallback @ 4 NONAME
+ _ZN13CGlobalDialog5NewLCEP19MGlobalNoteCallback @ 5 NONAME
+ _ZN16CObexUtilsDialog17CancelWaitDialogLEv @ 6 NONAME
+ _ZN16CObexUtilsDialog17LaunchWaitDialogLEi @ 7 NONAME
+ _ZN16CObexUtilsDialog18LaunchQueryDialogLERKi @ 8 NONAME
+ _ZN16CObexUtilsDialog21CancelProgressDialogLEv @ 9 NONAME
+ _ZN16CObexUtilsDialog21LaunchProgressDialogLEP26MObexUtilsProgressObserveriii @ 10 NONAME
+ _ZN16CObexUtilsDialog21ShowNumberOfSendFileLEii @ 11 NONAME
+ _ZN16CObexUtilsDialog21UpdateProgressDialogLEii @ 12 NONAME
+ _ZN16CObexUtilsDialog4NewLEP24MObexUtilsDialogObserver @ 13 NONAME
+ _ZN16CObexUtilsDialog5NewLCEP24MObexUtilsDialogObserver @ 14 NONAME
+ _ZN17TObexUtilsUiLayer11ContextIconERK9TMsvEntry13TContextMedia @ 15 NONAME
+ _ZN17TObexUtilsUiLayer12CreateIconsLE4TUidP9CArrayPtrIS1_I10CFbsBitmapEE @ 16 NONAME
+ _ZN17TObexUtilsUiLayer13ReadResourceLER6TDes16RKi @ 17 NONAME
+ _ZN17TObexUtilsUiLayer13UpdateBitmapsE4TUidRiR4TBufILi256EES1_S1_ @ 18 NONAME
+ _ZN17TObexUtilsUiLayer14ShowErrorNoteLERKi @ 19 NONAME
+ _ZN17TObexUtilsUiLayer15IsBackupRunningEv @ 20 NONAME
_ZN17TObexUtilsUiLayer18LaunchFileManagerLER7TDesC16ii @ 21 NONAME
- _ZN24TObexUtilsMessageHandler21RemoveTemporaryRFileLERK4TBufILi256EE @ 22 NONAME
- _ZN24TObexUtilsMessageHandler21SaveFileToFileSystemLERP14CObexBufObject4TUidRlR4TBufILi256EER5RFileRK7TDesC16 @ 23 NONAME
- _ZN24TObexUtilsMessageHandler22CreateInboxAttachmentLERP14CObexBufObject4TUidRlR5RFileRK7TDesC16 @ 24 NONAME
- _ZN24TObexUtilsMessageHandler22UpdateEntryAttachmentLER4TBufILi256EEP9CMsvEntry @ 25 NONAME
- _ZN17TObexUtilsUiLayer12CreateIconsLE4TUidP9CArrayPtrIS1_I10CFbsBitmapEE @ 26 NONAME
- _ZN26CObexUtilsPropertyNotifier4NewLEP31MObexUtilsPropertyNotifyHandler24TMemoryPropertyCheckType @ 27 NONAME
- _ZN24TObexUtilsMessageHandler24GetCenRepKeyStringValueLE4TUidmR6TDes16 @ 28 NONAME
- _ZN17TObexUtilsUiLayer24LaunchEditorApplicationLERl @ 29 NONAME
- _ZN16CObexUtilsDialog18LaunchQueryDialogLERKi @ 30 NONAME
- _ZN16CObexUtilsDialog21ShowNumberOfSendFileLEii @ 31 NONAME
- _ZN24TObexUtilsMessageHandler15SaveObjToInboxLEP14CObexBufObjectRK7TDesC164TUid @ 32 NONAME
- _ZN24TObexUtilsMessageHandler19RemoveInboxEntriesLERP14CObexBufObjectl @ 33 NONAME
- _ZN24TObexUtilsMessageHandler22CreateInboxAttachmentLERP14CObexBufObject4TUidRlR5RFile @ 34 NONAME
- _ZN24TObexUtilsMessageHandler22GetMessageCentreDriveLEv @ 35 NONAME
- _ZN24TObexUtilsMessageHandler20GetPubSubKeyIntValueE4TUidjRi @ 36 NONAME
- _ZN24TObexUtilsMessageHandler21GetCenRepKeyIntValueLE4TUidmRi @ 37 NONAME
- _ZN17TObexUtilsUiLayer33LaunchEditorApplicationOperationLER11CMsvSessionP9CMsvEntryR14TRequestStatus @ 38 NONAME
- _ZN24TObexUtilsMessageHandler24CreateDefaultMtmServiceLE4TUid @ 39 NONAME
- _ZN17TObexUtilsUiLayer28ShowGlobalConfirmationQueryLERKi @ 40 NONAME
- _ZN20CObexUtilsOpaqueData8IsStringEv @ 41 NONAME
- _ZN20CObexUtilsOpaqueData9GetNumberERj @ 42 NONAME
- _ZN20CObexUtilsOpaqueData9GetStringER5TBuf8ILi256EE @ 43 NONAME
- _ZN20CObexUtilsOpaqueDataC1ERK6TDesC8 @ 44 NONAME
- _ZN20CObexUtilsOpaqueDataC2ERK6TDesC8 @ 45 NONAME
- _ZN13CGlobalDialog15ProcessFinishedEv @ 46 NONAME
- _ZN13CGlobalDialog15ShowNoteDialogLEii @ 47 NONAME
- _ZN13CGlobalDialog16ShowErrorDialogLEi @ 48 NONAME
- _ZN13CGlobalDialog4NewLEP19MGlobalNoteCallback @ 49 NONAME
- _ZN13CGlobalDialog5NewLCEP19MGlobalNoteCallback @ 50 NONAME
- _ZN21CGlobalProgressDialog15ProcessFinishedEv @ 51 NONAME
- _ZN21CGlobalProgressDialog19ShowProgressDialogLEv @ 52 NONAME ABSENT
- _ZN21CGlobalProgressDialog20UpdateProgressDialogEii @ 53 NONAME
- _ZN21CGlobalProgressDialog4NewLEP23MGlobalProgressCallback @ 54 NONAME
- _ZN21CGlobalProgressDialog5NewLCEP23MGlobalProgressCallback @ 55 NONAME
- _ZN24TObexUtilsMessageHandler28CreateReceiveBufferAndRFileLER5RFileRK7TDesC16R4TBufILi256EERP8CBufFlati @ 56 NONAME
- _ZN17TObexUtilsUiLayer33ShowGlobalConfirmationQueryPlainLERKi @ 57 NONAME
- _ZN17TObexUtilsUiLayer36ShowGlobalFileOpenConfirmationQueryLERKiRK7TDesC16 @ 58 NONAME
- _ZN24TObexUtilsMessageHandler16AddEntryToInboxLERlR4TBufILi256EEP6RArrayIlE @ 59 NONAME
- _ZN21CGlobalProgressDialog19ShowProgressDialogLEi @ 60 NONAME
- _ZN24TObexUtilsMessageHandler16AddEntryToInboxLERlR4TBufILi256EE @ 61 NONAME
+ _ZN17TObexUtilsUiLayer20ShowInformationNoteLERKi @ 22 NONAME
+ _ZN17TObexUtilsUiLayer21OperationNotSupportedEv @ 23 NONAME
+ _ZN17TObexUtilsUiLayer24LaunchEditorApplicationLEP9CMsvEntryR11CMsvSession @ 24 NONAME
+ _ZN17TObexUtilsUiLayer24LaunchEditorApplicationLERl @ 25 NONAME
+ _ZN17TObexUtilsUiLayer28ShowGlobalConfirmationQueryLERKi @ 26 NONAME
+ _ZN17TObexUtilsUiLayer33LaunchEditorApplicationOperationLER11CMsvSessionP9CMsvEntryR14TRequestStatus @ 27 NONAME
+ _ZN17TObexUtilsUiLayer33ShowGlobalConfirmationQueryPlainLERKi @ 28 NONAME
+ _ZN17TObexUtilsUiLayer36ShowGlobalFileOpenConfirmationQueryLERKiRK7TDesC16 @ 29 NONAME
+ _ZN20CObexUtilsOpaqueData8IsStringEv @ 30 NONAME
+ _ZN20CObexUtilsOpaqueData9GetNumberERj @ 31 NONAME
+ _ZN20CObexUtilsOpaqueData9GetStringER5TBuf8ILi256EE @ 32 NONAME
+ _ZN20CObexUtilsOpaqueDataC1ERK6TDesC8 @ 33 NONAME
+ _ZN20CObexUtilsOpaqueDataC2ERK6TDesC8 @ 34 NONAME
+ _ZN21CGlobalProgressDialog15ProcessFinishedEv @ 35 NONAME
+ _ZN21CGlobalProgressDialog19ShowProgressDialogLEi @ 36 NONAME
+ _ZN21CGlobalProgressDialog20UpdateProgressDialogEii @ 37 NONAME
+ _ZN21CGlobalProgressDialog27ShowProgressDialogNameSizeLER7TDesC16x @ 38 NONAME
+ _ZN21CGlobalProgressDialog4NewLEP23MGlobalProgressCallback @ 39 NONAME
+ _ZN21CGlobalProgressDialog5NewLCEP23MGlobalProgressCallback @ 40 NONAME
+ _ZN24TObexUtilsMessageHandler15SaveObjToInboxLEP14CObexBufObjectRK7TDesC164TUid @ 41 NONAME
+ _ZN24TObexUtilsMessageHandler15SaveObjToInboxLERP14CObexBufObjectR5RFilel @ 42 NONAME
+ _ZN24TObexUtilsMessageHandler16AddEntryToInboxLERlR4TBufILi256EE @ 43 NONAME
+ _ZN24TObexUtilsMessageHandler16AddEntryToInboxLERlR4TBufILi256EEP6RArrayIlE @ 44 NONAME
+ _ZN24TObexUtilsMessageHandler18CreateOutboxEntryLERK4TUidRKi @ 45 NONAME
+ _ZN24TObexUtilsMessageHandler18DeleteOutboxEntryLERKl @ 46 NONAME
+ _ZN24TObexUtilsMessageHandler19GetFileSystemStatusEv @ 47 NONAME
+ _ZN24TObexUtilsMessageHandler19RemoveInboxEntriesLERP14CObexBufObjectl @ 48 NONAME
+ _ZN24TObexUtilsMessageHandler20GetPubSubKeyIntValueE4TUidjRi @ 49 NONAME
+ _ZN24TObexUtilsMessageHandler21GetCenRepKeyIntValueLE4TUidmRi @ 50 NONAME
+ _ZN24TObexUtilsMessageHandler21RemoveTemporaryRFileLERK4TBufILi256EE @ 51 NONAME
+ _ZN24TObexUtilsMessageHandler21SaveFileToFileSystemLERP14CObexBufObject4TUidRlR4TBufILi256EER5RFileRK7TDesC16 @ 52 NONAME
+ _ZN24TObexUtilsMessageHandler22CreateInboxAttachmentLERP14CObexBufObject4TUidRlR5RFile @ 53 NONAME
+ _ZN24TObexUtilsMessageHandler22CreateInboxAttachmentLERP14CObexBufObject4TUidRlR5RFileRK7TDesC16 @ 54 NONAME
+ _ZN24TObexUtilsMessageHandler22GetMessageCentreDriveLEv @ 55 NONAME
+ _ZN24TObexUtilsMessageHandler22GetMmcFileSystemStatusEv @ 56 NONAME
+ _ZN24TObexUtilsMessageHandler22UpdateEntryAttachmentLER4TBufILi256EEP9CMsvEntry @ 57 NONAME
+ _ZN24TObexUtilsMessageHandler24CreateDefaultMtmServiceLE4TUid @ 58 NONAME
+ _ZN24TObexUtilsMessageHandler24GetCenRepKeyStringValueLE4TUidmR6TDes16 @ 59 NONAME
+ _ZN24TObexUtilsMessageHandler28CreateReceiveBufferAndRFileLER5RFileRK7TDesC16R4TBufILi256EERP8CBufFlati @ 60 NONAME
+ _ZN26CObexUtilsPropertyNotifier4NewLEP31MObexUtilsPropertyNotifyHandler24TMemoryPropertyCheckType @ 61 NONAME
--- a/localconnectivityservice/obexserviceman/utils/inc/obexutilsglobalprogressdialog.h Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexserviceman/utils/inc/obexutilsglobalprogressdialog.h Sun Mar 14 13:12:17 2010 +0000
@@ -24,7 +24,7 @@
// INCLUDES
#include <e32base.h>
#include <stringresourcereader.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <avkon.rsg> // R_QGN_GRAF_WAIT_BAR_ANIM
#include <AknGlobalNote.h>
--- a/localconnectivityservice/obexserviceman/utils/inc/obexutilsuilayer.h Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexserviceman/utils/inc/obexutilsuilayer.h Sun Mar 14 13:12:17 2010 +0000
@@ -25,7 +25,7 @@
#include <data_caging_path_literals.hrh>
#include <AknsUtils.h>
#include <eikdialg.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
// CONSTANTS
@@ -55,6 +55,17 @@
EInfrared
};
+/**
+* Backup status.
+* The value is controlled by FileManager
+*/
+enum TFileManagerBkupStatusType
+ {
+ EFileManagerBkupStatusUnset = 0x00000000,
+ EFileManagerBkupStatusBackup = 0x00000001,
+ EFileManagerBkupStatusRestore = 0x00000002
+ };
+
// CLASS DECLARATION
/**
@@ -192,6 +203,10 @@
*/
IMPORT_C static void CreateIconsL( TUid aMedia, CArrayPtr<CBitmapArray>* aIconArrays);
+ /**
+ * Checks if backup process is running
+ */
+ IMPORT_C TBool static IsBackupRunning();
/**
* Prepares dialog for execution
@@ -205,6 +220,13 @@
* return True if enabled
*/
TBool static IsCoverDisplayL();
+
+ /**
+ * Check if process with given id is active now
+ * return True if is active
+ */
+ TBool static ProcessExists( const TSecureId& aSecureId );
+
/**
* A dummy class for opening CMsvSession.
*/
--- a/localconnectivityservice/obexserviceman/utils/src/obexutilsdialog.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexserviceman/utils/src/obexutilsdialog.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -23,7 +23,7 @@
#include <SecondaryDisplay/obexutilssecondarydisplayapi.h>
#include <aknnotewrappers.h>
#include <eikprogi.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <e32def.h>
#include <bautils.h>
#include <StringLoader.h>
--- a/localconnectivityservice/obexserviceman/utils/src/obexutilslaunchwaiter.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexserviceman/utils/src/obexutilslaunchwaiter.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -25,7 +25,7 @@
#include <AknCommonDialogsDynMem.h> // for memory and file selection dialogs
#include <CommonDialogs.rsg>
#include <pathinfo.h> // for getting drive root path
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <AknGlobalNote.h>
#include <StringLoader.h>
#include <AiwGenericParam.h>
--- a/localconnectivityservice/obexserviceman/utils/src/obexutilsmessagehandler.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexserviceman/utils/src/obexutilsmessagehandler.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -28,7 +28,7 @@
#include <txtrich.h>
#include <biouids.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <bautils.h>
#include <e32property.h>
@@ -926,8 +926,6 @@
// tempFullName will be updated in RenameFileL()
TInt error = RenameFileL(tempFullName, filename, parse.DriveAndPath(), fsSess);
-
-
if ( error != KErrNone )
{
fsSess.Delete(tempFullName); // If rename fails, we remove the temp RFile object.
@@ -1428,19 +1426,31 @@
const TDesC& aNewPath,
RFs& aFileSession)
{
+
// We move the file to the final location
//
CFileMan* fileMan= CFileMan::NewL(aFileSession);
CleanupStack::PushL(fileMan);
-
- fileMan->Move(aFileName,aNewPath,CFileMan::ERecurse );
- CleanupStack::PopAndDestroy(fileMan);
-
+ TPtrC tmpNewPath;
TParse fileParse;
fileParse.Set(aFileName, NULL, NULL);
+ TInt error = fileMan->Move(aFileName,aNewPath,CFileMan::ERecurse );
+
+ // if error while moving to new location, keep file in old location and change file name
+ if (error != KErrNone)
+ {
+ tmpNewPath.Set (fileParse.DriveAndPath());
+ }
+ else
+ {
+ tmpNewPath.Set (aNewPath);
+ }
+
+ CleanupStack::PopAndDestroy(fileMan);
+
TFileName tempFile;
- tempFile.Append(aNewPath);
+ tempFile.Append(tmpNewPath);
tempFile.Append(fileParse.NameAndExt());
aFileName = tempFile;
@@ -1450,22 +1460,23 @@
TFileName newFullName;
newFullName.Zero();
- newFullName.Append(aNewPath);
+ newFullName.Append(tmpNewPath);
newFullName.Append(aNewFileName);
- aFileSession.SetSessionPath(aNewPath);
+ aFileSession.SetSessionPath(tmpNewPath);
while ( BaflUtils::FileExists(aFileSession, newFullName) )
{
segmentNum++;
User::LeaveIfError( RenameFileWithSegmentNumL(aNewFileName, segmentNum, segmentString) );
newFullName.Zero();
- newFullName.Append(aNewPath);
+ newFullName.Append(tmpNewPath);
newFullName.Append(aNewFileName);
}
// rename the file.
//
- TInt error = aFileSession.Rename(aFileName, newFullName);
+ error = aFileSession.Rename(aFileName, newFullName);
+
aFileName = newFullName;
return error;
--- a/localconnectivityservice/obexserviceman/utils/src/obexutilsuilayer.cpp Mon Mar 08 21:44:15 2010 +0000
+++ b/localconnectivityservice/obexserviceman/utils/src/obexutilsuilayer.cpp Sun Mar 14 13:12:17 2010 +0000
@@ -22,12 +22,26 @@
#include "obexutilsdebug.h"
#include <SecondaryDisplay/obexutilssecondarydisplayapi.h>
-#include <obexutils.rsg>
+#include <Obexutils.rsg>
#include <aknnotewrappers.h>
#include <AknGlobalConfirmationQuery.h>
#include <eikon.rsg>
#include <avkon.rsg>
+#ifdef NO101APPDEPFIXES
#include <muiu.mbg>
+#else //NO101APPDEPFIXES
+enum TMuiuConsts
+ {
+ EMbmMuiuQgn_prop_mce_ir_unread = 16402,
+ EMbmMuiuQgn_prop_mce_ir_unread_mask = 16403,
+ EMbmMuiuQgn_prop_mce_ir_read = 16404,
+ EMbmMuiuQgn_prop_mce_ir_read_mask = 16405,
+ EMbmMuiuQgn_prop_mce_bt_unread = 16406,
+ EMbmMuiuQgn_prop_mce_bt_unread_mask = 16407,
+ EMbmMuiuQgn_prop_mce_bt_read = 16408,
+ EMbmMuiuQgn_prop_mce_bt_read_mask = 16409
+ };
+#endif //NO101APPDEPFIXES
#include <bautils.h>
#include <featmgr.h>
@@ -39,12 +53,13 @@
#include <apgcli.h>
#include <apacmdln.h>
#include <AknLaunchAppService.h> // Used to launch file manager in embedded mode.
+#include <e32property.h> //for checking backup status
-
+//Constants
+const TInt KFileManagerUID3 = 0x101F84EB; /// File Manager application UID3
const TInt KUiNumberOfZoomStates = 2; // second for the mask
const TInt KSortNumMax = 2;
-
// ============================ MEMBER FUNCTIONS ===============================
@@ -95,7 +110,7 @@
inParams->AppendL(TAiwGenericParam( EGenericParamDir, TAiwVariant( aPath ) ) );
inParams->AppendL(TAiwGenericParam( EGenericParamDir, TAiwVariant( aSortMethod ) ) );
- CAknLaunchAppService* launchService = CAknLaunchAppService::NewL(TUid::Uid( 0x101F84EB ), // Use File Manager app UID directly
+ CAknLaunchAppService* launchService = CAknLaunchAppService::NewL(TUid::Uid( KFileManagerUID3 ), // Use File Manager app UID directly
NULL,
inParams );
CleanupStack::PopAndDestroy( inParams );
@@ -108,7 +123,7 @@
RApaLsSession apaLsSession;
User::LeaveIfError( apaLsSession.Connect() );
CleanupClosePushL( apaLsSession );
- User::LeaveIfError( apaLsSession.GetAppInfo( appInfo, TUid::Uid( 0x101F84EB ) ) ); // Use File Manager app UID directly
+ User::LeaveIfError( apaLsSession.GetAppInfo( appInfo, TUid::Uid( KFileManagerUID3 ) ) ); // Use File Manager app UID directly
CApaCommandLine* apaCmdLine = CApaCommandLine::NewLC();
apaCmdLine->SetExecutableNameL( appInfo.iFullName );
apaCmdLine->SetCommandL( EApaCommandOpen );
@@ -509,6 +524,32 @@
}
// -----------------------------------------------------------------------------
+// TObexUtilsUiLayer::IsBackupRunning
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TBool TObexUtilsUiLayer::IsBackupRunning()
+ {
+ const TUint32 KFileManagerBkupStatus = 0x00000001;
+
+ TInt status = EFileManagerBkupStatusUnset;
+ TBool retValue = EFalse;
+ TInt err = RProperty::Get( TUid::Uid(KFileManagerUID3), KFileManagerBkupStatus,
+ status );
+ if ( err == KErrNone )
+ {
+ if ( status == EFileManagerBkupStatusBackup ||
+ status == EFileManagerBkupStatusRestore )
+ {
+ TSecureId fileManagerSecureId( KFileManagerUID3 );
+ //only returning ETrue if backup process is still active
+ retValue = ProcessExists( fileManagerSecureId );
+ }
+ }
+
+ return retValue;
+ }
+
+// -----------------------------------------------------------------------------
// TObexUtilsUiLayer::PrepareDialogExecuteL
// -----------------------------------------------------------------------------
//
@@ -538,4 +579,28 @@
return coverDisplay;
}
+// -----------------------------------------------------------------------------
+// TObexUtilsUiLayer::ProcessExists
+// -----------------------------------------------------------------------------
+//
+TBool TObexUtilsUiLayer::ProcessExists( const TSecureId& aSecureId )
+ {
+ _LIT( KFindPattern, "*" );
+ TFindProcess finder(KFindPattern);
+ TFullName processName;
+ while( finder.Next( processName ) == KErrNone )
+ {
+ RProcess process;
+ if ( process.Open( processName ) == KErrNone )
+ {
+ TSecureId processId( process.SecureId() );
+ process.Close();
+ if( processId == aSecureId )
+ {
+ return ETrue;
+ }
+ }
+ }
+ return EFalse;
+ }
// End of File
--- a/shortlinkconn_plat/obex_service_plugin_api/inc/SrcsInterface.h Mon Mar 08 21:44:15 2010 +0000
+++ b/shortlinkconn_plat/obex_service_plugin_api/inc/SrcsInterface.h Sun Mar 14 13:12:17 2010 +0000
@@ -111,7 +111,7 @@
TUid iDtor_ID_Key;
};
-#include "srcsinterface.inl"
+#include "SrcsInterface.inl"
#endif