author | William Roberts <williamr@symbian.org> |
Fri, 15 Oct 2010 17:29:33 +0100 | |
changeset 63 | ae68f05b0b2f |
parent 62 | d951a20326d6 |
child 64 | 6202a5be04d6 |
--- a/breakdeps/AknEcs.cpp Fri Oct 15 16:43:47 2010 +0100 +++ b/breakdeps/AknEcs.cpp Fri Oct 15 17:29:33 2010 +0100 @@ -325,7 +325,7 @@ TPhCltTelephoneNumber buffer = iCharBuffer; if (iPhCltEmergencyCall) { - err = iPhCltEmergencyCall->FindEmergencyPhoneNumber(buffer, isEmergency); + //err = iPhCltEmergencyCall->FindEmergencyPhoneNumber(buffer, isEmergency); } if ( err != KErrNone ) { @@ -438,7 +438,7 @@ _AKNTRACE_FUNC_ENTER; iEmergencyCallObserver = new (ELeave) CPhCltEmergencyCallObserver( this ); // Phone client interface - iPhCltEmergencyCall = CPhCltEmergencyCall::NewL( iEmergencyCallObserver ); + //iPhCltEmergencyCall = CPhCltEmergencyCall::NewL( iEmergencyCallObserver ); // Check if service call is allowed during device and key lock iServiceCallEnabled = @@ -864,12 +864,14 @@ RDebug::Print(KDebugAttemptEmergencyCall); #endif +#if 0 TRAPD( err, iPhCltEmergencyCall->DialEmergencyCallL( CurrentMatch() ) ); __ASSERT_DEBUG( err==KErrNone, Panic( EAknEcsPanicDialLLeft ) ); if(err != KErrNone) { err = KErrNone; } +#endif _AKNTRACE_FUNC_EXIT; }
--- a/breakdeps/avkon.mmp Fri Oct 15 16:43:47 2010 +0100 +++ b/breakdeps/avkon.mmp Fri Oct 15 17:29:33 2010 +0100 @@ -20,15 +20,16 @@ #include <data_caging_paths.hrh> #include <platform_paths.hrh> -TARGET avkon.dll +TARGET stem_avkon.dll TARGETTYPE dll UID 0x1000008D 0x100056C6 CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT -SOURCEPATH ../srcdata +SOURCEPATH /sf/mw/classicui/uifw/AvKon/srcdata +#if 0 // don't need stem versions of these resource files START RESOURCE avkon.rss HEADER TARGETPATH RESOURCE_FILES_DIR @@ -46,6 +47,7 @@ TARGETPATH RESOURCE_FILES_DIR LANGUAGE_IDS END +#endif #ifndef WINSCW EPOCALLOWDLLDATA @@ -54,12 +56,15 @@ MACRO TFX_USE_WCHANGE_EVENT // Enable these if TfxServer CRP supports the EWindowGroupChanged event // Note: must be enabled also in akncapserver.mmp and wsdrawer.mmp -USERINCLUDE ../inc -USERINCLUDE ../../inc -USERINCLUDE ../../../inc -USERINCLUDE ../../eikctl/inc -USERINCLUDE ../../EikStd/coctlinc -USERINCLUDE . ../inc ../animdllinc ../akncompamode/inc +USERINCLUDE /sf/mw/classicui/uifw/AvKon/inc +USERINCLUDE /sf/mw/classicui/uifw/inc +USERINCLUDE /sf/mw/classicui/inc +USERINCLUDE /sf/mw/classicui/uifw/eikctl/inc +USERINCLUDE /sf/mw/classicui/uifw/EikStd/coctlinc +USERINCLUDE /sf/mw/classicui/uifw/AvKon/group +USERINCLUDE /sf/mw/classicui/uifw/AvKon/inc +USERINCLUDE /sf/mw/classicui/uifw/AvKon/animdllinc +USERINCLUDE /sf/mw/classicui/uifw/AvKon/akncompamode/inc // This is a SYSTEMINCLUDE macro containing the middleware // and applications layer specific include directories @@ -67,7 +72,7 @@ OS_LAYER_LIBC_SYSTEMINCLUDE -SOURCEPATH ../src +SOURCEPATH /sf/mw/classicui/uifw/AvKon/src SOURCE aknview.cpp SOURCE aknApp.cpp @@ -170,7 +175,11 @@ SOURCE aknshut.cpp SOURCE AknKeyLock.cpp SOURCE AknIncallStatusBubble.cpp + +SOURCEPATH . SOURCE AknEcs.cpp + +SOURCEPATH /sf/mw/classicui/uifw/AvKon/src SOURCE AknNumEdwin.cpp SOURCE AknDlgShut.cpp SOURCE AknGMSStyleGrid.cpp @@ -307,7 +316,6 @@ LIBRARY form.lib LIBRARY estor.lib LIBRARY CommonEngine.lib -LIBRARY phoneclient.lib LIBRARY apparc.lib LIBRARY aknnotify.lib // Global Note LIBRARY insock.lib // For IP address copying in CAknIpFieldSettingPage @@ -347,7 +355,7 @@ LIBRARY hwrmlightclient.lib LIBRARY aiwdialdata.lib -DEFFILE AVKON.def +DEFFILE /sf/mw/classicui/uifw/AvKon/~/AVKON.def START WINS baseaddress 0x7dc00000
--- a/group/bld.inf Fri Oct 15 16:43:47 2010 +0100 +++ b/group/bld.inf Fri Oct 15 17:29:33 2010 +0100 @@ -20,10 +20,19 @@ DEFAULT PRJ_MMPFILES -..\startup\ssmcmdlists.mmp -..\startup\ssmstartuppolicy.mmp -..\breakdeps\backend.mmp -..\breakdeps\cone.mmp -..\breakdeps\SVGEngine.mmp -..\breakdeps\eiksrvui.mmp + +// based on sf/os/devicesrv +../startup/ssmcmdlists.mmp +../startup/ssmstartuppolicy.mmp + +// based on sf/os/ossrv +../breakdeps/backend.mmp +// based on sf/mw/classicui +../breakdeps/cone.mmp +../breakdeps/eiksrvui.mmp +../breakdeps/avkon.mmp + +// based on sf/mw/svgt +../breakdeps/SVGEngine.mmp +
--- a/syborg_stem/rom_content.csv Fri Oct 15 16:43:47 2010 +0100 +++ b/syborg_stem/rom_content.csv Fri Oct 15 17:29:33 2010 +0100 @@ -2865,7 +2865,7 @@ sys\bin\avctpservices.dll,/epoc32/release/armv5/urel/avctpservices.dll,bluetooth.iby,os/bt,,, Sys\Bin\aviplaycontroller.dll,/epoc32/release/armv5/urel/aviplaycontroller.dll,avi.iby,os/mm,,, Sys\Bin\avirecordcontroller.dll,/epoc32/release/armv5/urel/avirecordcontroller.dll,avi.iby,os/mm,,, -sys\bin\avkon.dll,/epoc32/release/armv5/urel/avkon.dll,core/mw/avkon.iby,mw/classicui,,, +sys\bin\avkon.dll,/epoc32/release/armv5/urel/avkon.dll,core/mw/avkon.iby,mw/classicui,Stem,WR,Qt depends on this Sys\Bin\avkonfep.dll,/epoc32/release/armv5/urel/avkonfep.dll,customer/mw/aknfep_variant.iby,mw/inputmethods,,, Sys\Bin\avkonstartupextensionplugin.dll,/epoc32/release/armv5/urel/avkonstartupextensionplugin.dll,core/mw/aknglobalui.iby,mw/classicui,,, sys\bin\avmediaserver.exe,/epoc32/release/armv5/urel/avmediaserver.exe,core/mw/upnpmediaserver.iby,mw/dlnasrv,,, @@ -3547,7 +3547,7 @@ sys\bin\eswtapifacade.dll,/epoc32/release/armv5/urel/eswtapifacade.dll,core/app/java.iby,app/jrt,,, sys\bin\eswtdirectcontent.dll,/epoc32/release/armv5/urel/eswtdirectcontent.dll,core/app/java.iby,app/jrt,,, sys\bin\eswtphysics.dll,/epoc32/release/armv5/urel/eswtphysics.dll,core/app/java.iby,app/jrt,,, -sys\bin\ETel.dll,/epoc32/release/armv5/urel/etel.dll,etel.iby,os/cellularsrv,,WR,Stem does not support telephony +sys\bin\ETel.dll,/epoc32/release/armv5/urel/etel.dll,etel.iby,os/cellularsrv,Out,WR,Stem does not support telephony sys\bin\Etel3rdParty.dll,/epoc32/release/armv5/urel/etel3rdparty.dll,etelisv.iby,os/cellularsrv,,, sys\bin\etelmm.dll,/epoc32/release/armv5/urel/etelmm.dll,etelmm.iby,os/cellularsrv,,, sys\bin\etelpckt.dll,/epoc32/release/armv5/urel/etelpckt.dll,etelpckt.iby,os/cellularsrv,,,
--- a/syborg_stem/static_dependencies.txt Fri Oct 15 16:43:47 2010 +0100 +++ b/syborg_stem/static_dependencies.txt Fri Oct 15 17:29:33 2010 +0100 @@ -4104,3 +4104,4 @@ sys\bin\xn3utils.dll /epoc32/release/armv5/urel/xn3utils.dll sid=2001cb51:drtaeabi.dll:ecom[10009d8e].dll:euser[100039e5].dll:scppnwdl.dll sys\bin\Cone.dll /epoc32/release/armv5/urel/stem_cone.dll sid=10003a41:bafl[10003a0f].dll:centralrepository[101fbc70].dll:drtaeabi.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:estor[10003b0d].dll:euser[100039e5].dll:gdi[10003b15].dll:hal[100039e8].dll:scppnwdl.dll:viewcli[10003f33].dll:ws32[10003b21].dll sys\bin\SVGEngine.dll /epoc32/release/armv5/urel/stem_svgengine.dll sid=101f856e:VGRenderer[0152d27e].dll:XMLInterface[101f9750].dll:avkon[100056c6].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:caf.dll:charconv[10003b11].dll:dfpaeabi.dll:drtaeabi.dll:efsrv[100039e4].dll:estor[10003b0d].dll:euser[100039e5].dll:ezlib[10005706].dll:fbscli[10003a15].dll:gdi[10003b15].dll:hal[100039e8].dll:imageconversion[101f45ad].dll:imut[10004837].dll:scppnwdl.dll +sys\bin\avkon.dll /epoc32/release/armv5/urel/stem_avkon.dll sid=100056c6:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:AknLayout2Scalable[102040d7].dll:AknNotify[010f9a43].dll:AknPictograph[10207364].dll:CdlEngine[101f8243].dll:CommonEngine[100058fe].dll:FontProvider[1020509c].dll:FontUtils[1020509d].dll:NumberGrouping[10003fd3].dll:PtiEngine[101f8610].dll:ServiceHandler[101f865a].dll:aiwdialdata[102828ab].dll:akncapserverclient[10207244].dll:aknlayout2[10158c94].dll:aknlistloadertfx.dll:aknphysics[20021194].dll:akntransitionutils.dll:apgrfx[10003a3c].dll:apmime[10003a1a].dll:apparc[10003a3d].dll:bafl[10003a0f].dll:bitgdi[10003b18].dll:bmpanim[100048f2].dll:cenrepnotifhandler[10200c8a].dll:centralrepository[101fbc70].dll:cone[10003a41].dll:dfpaeabi.dll:drtaeabi.dll:drtrvct2_2.dll:ecom[10009d8e].dll:efsrv[100039e4].dll:egul[100048a2].dll:eikcoctl[1000489e].dll:eikcore[10004892].dll:eikctl[1000489c].dll:eikdlg[10004898].dll:eiksrvc[100053b1].dll:estor[10003b0d].dll:etext[10003a1c].dll:euser[100039e5].dll:fbscli[10003a15].dll:featmgr[10005a2b].dll:fepbase[10003b14].dll:findutil[10005a19].dll:form[10003b27].dll:gdi[10003b15].dll:gfxtrans[102822a4].dll:hlplch[101f423b].dll:hwrmlightclient[10205029].dll:insock[10003d44].dll:linebreak[101f747f].dll:numberconversion[101f7800].dll:oommonitor[10282dbf].dll:scppnwdl.dll:tacticon[2001fe4e].dll:touchfeedback[2000b491].dll:ws32[10003b21].dll