--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -242,11 +242,11 @@
             currentIndexfile.close();
             if (!iWatcher) {
                 // Set up the file watcher for active theme changes
-                TRAP_IGNORE(iWatcher = CHbThemeWatcher::NewL(*this));
+                iWatcher = new HbThemeWatcher(*this);
             }
-            // Start watching in case of mmc ejection
+            // Start watching in case of mmc ejection or active theme uninstall
             if (iWatcher) {
-                iWatcher->startWatchingL(indexFileName);
+                iWatcher->startWatching(indexFileName);
             }
         }
     }
@@ -1205,7 +1205,7 @@
     QColor color = GetColorFromRgba(params.rgba, params.colorflag);
     QString iconId((QChar*)params.multiPartIconId.Ptr(), params.multiPartIconId.Length());
     QString fullPath((QChar*)params.multiPartIconList[0].Ptr(), params.multiPartIconList[0].Length());
-    int index = fullPath.lastIndexOf("/");
+    int index = fullPath.lastIndexOf('/');
     fullPath = fullPath.left(index + 1);
     iconId.prepend(fullPath);
     HbIconKey finalIconKey(iconId,
@@ -1295,7 +1295,7 @@
   Checks for the cacheItem for a given key, if found gets the data relevant of the cacheItem.
  */
 
-bool HbThemeServerSession::IconInfoFromSingleIcon(HbIconKey key,
+bool HbThemeServerSession::IconInfoFromSingleIcon(HbIconKey &key,
         HbSharedIconInfo &stitchedData, const QString & format)
 {
     HbIconCacheItem* cacheItem = 0;
@@ -1342,7 +1342,8 @@
   else free the data allocated for the cache.
  */
 
-bool HbThemeServerSession::CreateCacheItemData(HbIconKey key, int options , HbSharedIconInfo &data, bool isMultiIcon)
+bool HbThemeServerSession::CreateCacheItemData(const HbIconKey &key, int options, 
+                                               HbSharedIconInfo &data, bool isMultiIcon)
 {
     bool insertKeyIntoSessionList = false;
     data.type = INVALID_FORMAT;