--- a/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp Tue Feb 02 00:22:03 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp Fri Mar 19 09:34:30 2010 +0200
@@ -19,10 +19,11 @@
// INCLUDE FILES
#include "CProfileTonesImpl.h"
+#include "ProfileEngUtils.h"
+#include "ProfileEnginePrivateCRKeys.h"
+
#include <s32strm.h>
#include <centralrepository.h>
-#include "ProfileEngUtils.h"
-#include "ProfileEnginePrivateCRKeys.h"
#include <hwrmvibrasdkcrkeys.h>
#include <psmsettings.h>
@@ -150,9 +151,6 @@
aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngVibra,
aProfileId ), iProfileToneSettings.iVibratingAlert ) );
User::LeaveIfError(
- aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngEmailVibra,
- aProfileId ), iProfileToneSettings.iEmailVibratingAlert ) );
- User::LeaveIfError(
aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngWarnAndGameTones,
aProfileId ), iProfileToneSettings.iWarningAndGameTones ) );
User::LeaveIfError(
@@ -167,7 +165,6 @@
if ( iPowerSaveMode )
{
iProfileToneSettings.iVibratingAlert = iPsmConfigVibra;
- iProfileToneSettings.iEmailVibratingAlert = iPsmConfigVibra;
iProfileToneSettings.iKeypadVolume =
TProfileKeypadVolume( iPsmConfigKeypadVolume );
}
@@ -215,11 +212,8 @@
User::LeaveIfError(
aCenRep.Set( ProfileEngUtils::ResolveKey( KProEngVibra,
aProfileId ), iProfileToneSettings.iVibratingAlert ) );
-
- User::LeaveIfError(
- aCenRep.Set( ProfileEngUtils::ResolveKey( KProEngEmailVibra,
- aProfileId ), iProfileToneSettings.iEmailVibratingAlert ) );
- }
+ }
+
User::LeaveIfError(
aCenRep.Set( ProfileEngUtils::ResolveKey( KProEngWarnAndGameTones,
aProfileId ), iProfileToneSettings.iWarningAndGameTones ) );