--- a/src/hbcore/core/hbsharedmemorymanagerut_p.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/core/hbsharedmemorymanagerut_p.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -52,9 +52,7 @@
         }
         writable = true;
         if ( !success ) {
-#ifdef THEME_SERVER_TRACES
-            qDebug() << "HbSharedMemoryManager:: Could not initialize shared memory chunk";
-#endif //THEME_SERVER_TRACES
+            THEME_GENERIC_DEBUG() << "HbSharedMemoryManager:: Could not initialize shared memory chunk";
             delete chunk; 
             chunk = 0;
         }
@@ -70,13 +68,14 @@
             mainAllocator->initialize(chunk, chunkHeader->mainAllocatorOffset);
             subAllocator->initialize(chunk, chunkHeader->subAllocatorOffset, mainAllocator);
         } else {
+            memset(chunkHeader, 0, sizeof(HbSharedChunkHeader));
             chunkHeader->mainAllocatorOffset = sizeof(HbSharedChunkHeader);
             // Clear also allocator identifier so that they will not try to re-connect
-            qptrdiff *mainAllocatorIdentifier = reinterpret_cast<qptrdiff *>(static_cast<char *>(base()) + chunkHeader->mainAllocatorOffset);
+            quint32 *mainAllocatorIdentifier = reinterpret_cast<quint32 *>(static_cast<char *>(base()) + chunkHeader->mainAllocatorOffset);            
             *mainAllocatorIdentifier = 0;
             mainAllocator->initialize(chunk, chunkHeader->mainAllocatorOffset);
             chunkHeader->subAllocatorOffset = alloc(SPACE_NEEDED_FOR_MULTISEGMENT_ALLOCATOR);
-            qptrdiff *subAllocatorIdentifier = reinterpret_cast<qptrdiff *>(static_cast<char *>(base()) + chunkHeader->subAllocatorOffset);
+            quint32 *subAllocatorIdentifier = reinterpret_cast<quint32 *>(static_cast<char *>(base()) + chunkHeader->subAllocatorOffset);
             *subAllocatorIdentifier = 0;
             subAllocator->initialize(chunk, chunkHeader->subAllocatorOffset, mainAllocator);
             chunkHeader->identifier = INITIALIZED_CHUNK_IDENTIFIER;
@@ -128,7 +127,7 @@
     if( !memManager ){
         memManager = new HbSharedMemoryManagerUt();
         if( !memManager->initialize() ) {
-            qWarning( "HbSharedMemoryManager:Could not initialize shared memory" );
+            hbWarning( "HbSharedMemoryManager:Could not initialize shared memory" );
             delete memManager;
             memManager = 0;
         }