# HG changeset patch # User William Roberts # Date 1272456947 -3600 # Node ID a2e87f73f7d78b9254a7e68c8392811f36ab8f87 # Parent 91c2fb4b78dfd9b8c428f91bff895ac741706e7d# Parent 5d467ea4b3e5bedcc6eef69580eafc011699c6e7 Remerge fix for Bug 1614 and Bug 2360 diff -r 91c2fb4b78df -r a2e87f73f7d7 phoneapp/phoneuistates/bwins/phoneuistatesu.def --- a/phoneapp/phoneuistates/bwins/phoneuistatesu.def Tue Apr 27 16:37:10 2010 +0300 +++ b/phoneapp/phoneuistates/bwins/phoneuistatesu.def Wed Apr 28 13:15:47 2010 +0100 @@ -1,6 +1,6 @@ EXPORTS - ?ConstructL@CPhoneTwoSingles@@MAEXXZ @ 1 NONAME ; void CPhoneTwoSingles::ConstructL(void) - ?NewPhoneUIStateMachineFactoryL@@YAPAVCPhoneUIStateMachineFactoryBase@@XZ @ 2 NONAME ; class CPhoneUIStateMachineFactoryBase * NewPhoneUIStateMachineFactoryL(void) + ?NewPhoneUIStateMachineFactoryL@@YAPAVCPhoneUIStateMachineFactoryBase@@XZ @ 1 NONAME ; class CPhoneUIStateMachineFactoryBase * NewPhoneUIStateMachineFactoryL(void) + ?ConstructL@CPhoneTwoSingles@@MAEXXZ @ 2 NONAME ; void CPhoneTwoSingles::ConstructL(void) ?SendGlobalErrorNoteL@CPhoneErrorMessagesHandler@@IAEXH@Z @ 3 NONAME ; void CPhoneErrorMessagesHandler::SendGlobalErrorNoteL(int) ?HandleKeyMessageL@CPhoneAlerting@@MAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 4 NONAME ; void CPhoneAlerting::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) ?HandleKeyMessageL@CPhoneTwoSingles@@UAEXW4TPhoneKeyEventMessages@MPhoneKeyEvents@@W4TKeyCode@@@Z @ 5 NONAME ; void CPhoneTwoSingles::HandleKeyMessageL(enum MPhoneKeyEvents::TPhoneKeyEventMessages, enum TKeyCode) diff -r 91c2fb4b78df -r a2e87f73f7d7 phoneapp/silenceactionplugin/group/bld.inf --- a/phoneapp/silenceactionplugin/group/bld.inf Tue Apr 27 16:37:10 2010 +0300 +++ b/phoneapp/silenceactionplugin/group/bld.inf Wed Apr 28 13:15:47 2010 +0100 @@ -10,6 +10,7 @@ * Nokia Corporation - initial contribution. * * Contributors: +* NTT DOCOMO, INC - BUG 2360 * * Description: Build file for silence action plugin. * @@ -23,11 +24,7 @@ DEFAULT PRJ_EXPORTS -../data/silence.rul\ - /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/silence.rul - -../data/silence.rul\ - /epoc32/data/Z/private/10282BC4/Rules/silence.rul +../data/silence.rul z:/private/10282BC4/Rules/silence.rul ../data/silenceactionplugin_stub.SIS\ /epoc32/data/z/system/install/silenceactionplugin_stub.SIS