--- a/presetserver/include/psutils.inl	Tue Jul 06 14:07:20 2010 +0300
+++ b/presetserver/include/psutils.inl	Wed Aug 18 09:40:26 2010 +0300
@@ -16,11 +16,7 @@
 */
 
 
-#if defined __SERIES60_30__ || defined __SERIES60_31__
-_LIT( KPSDatabaseFileName, "\\data\\pspresets.db" );    // File name of the preset database.
-#else
 _LIT( KPSDatabaseFileName, "pspresets.db" );            // File name of the preset database.
-#endif
 
 // ---------------------------------------------------------------------------
 // Gets the full file name and path to the preset database file.
@@ -35,9 +31,6 @@
 
     TParse parse;
 
-#if defined __SERIES60_30__ || defined __SERIES60_31__
-    parse.Set( KPSDatabaseFileName, &drive, NULL );
-#else
     // The database file resides in the server's private directory from 3.2 onwards.
     TFileName privatePath;
     
@@ -49,7 +42,6 @@
     parse.Set( privatePath, &KPSDatabaseFileName, &drive );
 
     CleanupStack::PopAndDestroy( &fsSession );
-#endif
 
     aFullName = parse.FullName();