--- a/src/hbservers/hbthemeserver/hbthemeserverapplication.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserverapplication.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -113,11 +113,9 @@
             result = library.load();
         }
     }
-#ifdef THEME_SERVER_TRACES
     if (!result) {
-        qDebug() << "loadLibrary():" << library.errorString();
+        THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "Error: " << library.errorString();
     }
-#endif
     return result;
 }
 
@@ -130,9 +128,7 @@
         if (lockState == Lock::Reserved) {
             // Process may be starting, wait for server object to be created
             if (serverExists()) {
-#ifdef THEME_SERVER_TRACES
-                qDebug() << "HbThemeServerLocker::lock: serverExists";
-#endif
+                THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "server already exists.";
                 break;
             } else {
                 const TInt KTimeout = 100000; // 100 ms
@@ -145,9 +141,7 @@
     
     if (lockState != Lock::Acquired) {
         // With KErrAlreadyExists client should try to connect, otherwise bail out.
-#ifdef THEME_SERVER_TRACES
-        qDebug() << "HbThemeServer::main: Lock not acquired!!!";
-#endif
+        THEME_GENERIC_DEBUG() << Q_FUNC_INFO << "Lock not acquired.";
         RProcess::Rendezvous(lockState == Lock::Reserved ? KErrAlreadyExists : KErrGeneral);
     }