# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286969543 -10800
# Node ID d0e1a4b4089743538d4118764267e0140605757d
# Parent  ea11b8c1e6a4a06a79321761ba7ed5906f2856b8
Revision: 201039
Kit: 201041

diff -r ea11b8c1e6a4 -r d0e1a4b40897 help/data/xhtml.zip
Binary file help/data/xhtml.zip has changed
diff -r ea11b8c1e6a4 -r d0e1a4b40897 profile_plat/profiles_settings_view_api/inc/CProfileToneHandler.h
--- a/profile_plat/profiles_settings_view_api/inc/CProfileToneHandler.h	Tue Sep 14 21:19:36 2010 +0300
+++ b/profile_plat/profiles_settings_view_api/inc/CProfileToneHandler.h	Wed Oct 13 14:32:23 2010 +0300
@@ -26,7 +26,7 @@
 
 //  INCLUDES
 #include <f32file.h> // CBase, RFs
-#include <MSSSettingsObserver.h> // MSSSettingsObserver, RSSSettings
+#include <msssettingsobserver.h> // MSSSettingsObserver, RSSSettings
 #include <apmstd.h> // KMaxDataTypeLength
 #include <data_caging_path_literals.hrh>
 
diff -r ea11b8c1e6a4 -r d0e1a4b40897 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp	Tue Sep 14 21:19:36 2010 +0300
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp	Wed Oct 13 14:32:23 2010 +0300
@@ -205,13 +205,6 @@
 //
 void CProfilePlayingVolumeSettingPage::CheckRingingToneTypeL()
 	{
-    // If the preview tone is not NULL, delete it.
-    if ( iPreviewTone )
-        {
-        delete iPreviewTone;
-        iPreviewTone = NULL;
-        }
-    
 	// Get default tone from cenrep
 	TFileName defaultTone;
 	CRepository* cenrep = CRepository::NewL( KCRUidProfileEngine );
diff -r ea11b8c1e6a4 -r d0e1a4b40897 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/ProfileSettingsView.rss
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/ProfileSettingsView.rss	Tue Sep 14 21:19:36 2010 +0300
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/ProfileSettingsView.rss	Wed Oct 13 14:32:23 2010 +0300
@@ -22,7 +22,7 @@
 
 // INTERNAL INCLUDES
 #include <profileapp.loc>
-#include <Profile.loc>
+#include <profile.loc>
 #include "ProfileSettingsView.hrh"
 #include "ProfileInternal.hrh"
 
diff -r ea11b8c1e6a4 -r d0e1a4b40897 profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp
--- a/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp	Tue Sep 14 21:19:36 2010 +0300
+++ b/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp	Wed Oct 13 14:32:23 2010 +0300
@@ -472,7 +472,6 @@
 			CAknErrorNote* note = new( ELeave ) CAknErrorNote( ETrue );
 			note->ExecuteLD( *errorText );
 			CleanupStack::PopAndDestroy( errorText );
-            CleanupStack::PopAndDestroy( expiryTime );
     		return;
     		}
     	
diff -r ea11b8c1e6a4 -r d0e1a4b40897 profilesapplication/Profiles/ProfileApp/UIsrc/ProfileApp.rss
--- a/profilesapplication/Profiles/ProfileApp/UIsrc/ProfileApp.rss	Tue Sep 14 21:19:36 2010 +0300
+++ b/profilesapplication/Profiles/ProfileApp/UIsrc/ProfileApp.rss	Wed Oct 13 14:32:23 2010 +0300
@@ -32,7 +32,7 @@
 #include <ProfileEng.hrh>
 #include <Profile.hrh>
 #include <profileapp.loc>
-#include <Profile.loc>
+#include <profile.loc>
 #include "ProfileApp.hrh"
 #include <data_caging_paths_strings.hrh>