# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268401439 -7200
# Node ID a152385bb39de603d4bdfcaff1f30bdae91de0ca
# Parent  071f3cdcec690cfb801d49d6258ed17eeffbdc10
Revision: 201007
Kit: 201008

diff -r 071f3cdcec69 -r a152385bb39d imservices/imfeatureplugin/srcutils/imlogutils.cpp
--- a/imservices/imfeatureplugin/srcutils/imlogutils.cpp	Fri Feb 19 23:08:08 2010 +0200
+++ b/imservices/imfeatureplugin/srcutils/imlogutils.cpp	Fri Mar 12 15:43:59 2010 +0200
@@ -27,12 +27,14 @@
 
 void XImLogger::Log(TRefByValue<const TDesC> aFmt,...)
     {
+#ifdef _DEBUG
     VA_LIST list;
     VA_START(list, aFmt);
     // Print to log file
     TBuf<KLogBufferLength> buf;
     buf.FormatList(aFmt, list);
     RFileLogger::Write(KImLogDir, KImLogFile, EFileLoggingModeAppend, buf);
+#endif
     }
 
 //  End of File  
diff -r 071f3cdcec69 -r a152385bb39d imservices/instantmessagingcache/imcacheclient/src/cimcacheaccesseventhandler.cpp
--- a/imservices/instantmessagingcache/imcacheclient/src/cimcacheaccesseventhandler.cpp	Fri Feb 19 23:08:08 2010 +0200
+++ b/imservices/instantmessagingcache/imcacheclient/src/cimcacheaccesseventhandler.cpp	Fri Mar 12 15:43:59 2010 +0200
@@ -120,11 +120,20 @@
 		    break;
 		    }
        case EIMOperationUnRegistered:
-			{
-			TRACE( T_LIT("CIMCacheEventHandler::RunL() EIMOperationUnRegistered") );
-			iContinueObserving = EFalse;	
-			break;	
-			}
+            {
+            TRACE(T_LIT(
+                    "CIMCacheEventHandler::RunL() EIMOperationUnRegistered"));
+            iContinueObserving = EFalse;
+            break;
+            }
+        case KErrServerTerminated:
+            {
+            // This case handles when the server terminated status is set.
+            // This is scenario is typically scene when imcache server is uninstalled.
+            UnRegisterObserver();
+            DoCancel();
+            break;
+            }
 		default :
 		    {
 		    TRACE( T_LIT("CIMCacheEventHandler::RunL() default") );
diff -r 071f3cdcec69 -r a152385bb39d imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp
--- a/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp	Fri Feb 19 23:08:08 2010 +0200
+++ b/imservices/instantmessagingcache/imcacheclient/src/cimcacheeventhandler.cpp	Fri Mar 12 15:43:59 2010 +0200
@@ -135,6 +135,16 @@
 			iContinueObserving = EFalse;	
 			break;	
 			}
+		case KErrServerTerminated:
+            {
+            // This case handles when the server terminated status is set.
+            // This is scenario is typically scene when imcache server is uninstalled.
+
+            UnRegisterObserver();
+            DoCancel();
+            break;
+            }
+
 		default :
 		    {
 		    TRACE( T_LIT("CIMCacheEventHandler::RunL() default") );
diff -r 071f3cdcec69 -r a152385bb39d imservices/searchfeatureplugin/srcutils/searchlogutils.cpp
--- a/imservices/searchfeatureplugin/srcutils/searchlogutils.cpp	Fri Feb 19 23:08:08 2010 +0200
+++ b/imservices/searchfeatureplugin/srcutils/searchlogutils.cpp	Fri Mar 12 15:43:59 2010 +0200
@@ -27,12 +27,14 @@
 
 void XSearchLogger::Log(TRefByValue<const TDesC> aFmt,...)
     {
+#ifdef _DEBUG
     VA_LIST list;
     VA_START(list, aFmt);
     // Print to log file
     TBuf<KLogBufferLength> buf;
     buf.FormatList(aFmt, list);
     RFileLogger::Write(KImLogDir, KImLogFile, EFileLoggingModeAppend, buf);
+#endif
     }
 
 //  End of File