diff -r d37779bbda25 -r 41b64ea195fa imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/fixed_id.definitions
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/fixed_id.definitions	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/fixed_id.definitions	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-##
-# This is Default Licence added by TraceCompiler
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-##
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_FATAL=0x81
 [GROUP]TRACE_NORMAL=0x86
@@ -99,7 +82,6 @@
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILMEMORYCARDOBSERVER_STARTNOTIFY=0x49
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_CTHUMBNAILSCALETASK=0x4a
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_DOCANCEL=0x56
-[TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_ENCODEL=0x1e3
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_RUNL=0x53
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_STARTL=0x4c
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x57
@@ -113,7 +95,6 @@
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_DELETETHUMBNAILSBYIDL=0xe7
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_DELETETHUMBNAILSL=0xe6
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_FETCHTHUMBNAILL=0xda
-[TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_GETJPEGBUFFERL=0x1f4
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_GETMIMETYPELISTL=0xe8
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_PROCESSBITMAPL=0xdd
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_RELEASEBITMAP=0xdf
@@ -125,7 +106,6 @@
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL=0xc8
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_RESOLVEMIMETYPEL=0xe9
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_SERVICEL=0xb1
-[TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_SETJPEGBUFFERL=0x1f3
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_UPDATETHUMBNAILSL=0xb5
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVER_ADDBITMAPTOPOOLL=0x70
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVER_ADDSESSION=0x69
@@ -194,7 +174,6 @@
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSTORE_STARTAUTOFLUSH=0x158
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSTORE_STARTMAINTENANCE=0x15b
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSTORE_STOPAUTOFLUSH=0x15a
-[TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSTORE_STORETHUMBNAILL=0x1f5
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILTASKPROCESSOR_ADDTASKL=0x1a3
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILTASKPROCESSOR_CONSTRUCTL=0x19e
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILTASKPROCESSOR_CTHUMBNAILTASKPROCESSOR=0x1a2
@@ -231,26 +210,31 @@
 [TRACE]TRACE_NORMAL[0x86]_CTMSHUTDOWNOBSERVER_CTMSHUTDOWNOBSERVER=0x1de
 [TRACE]TRACE_NORMAL[0x86]_CTMSHUTDOWNOBSERVER_DOCANCEL=0x1e1
 [TRACE]TRACE_NORMAL[0x86]_CTMSHUTDOWNOBSERVER_RUNL=0x1df
-[TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x1ec
-[TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0x1ed
 [TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14c
 [TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x168
 [TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11a
-[TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0x1ee
 [TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14d
 [TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x169
-[TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0x1ef
+[TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11b
 [TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14e
 [TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x16a
+[TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11c
 [TRACE]TRACE_NORMAL[0x86]_DUP13_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14f
 [TRACE]TRACE_NORMAL[0x86]_DUP13_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x16b
+[TRACE]TRACE_NORMAL[0x86]_DUP13_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11d
 [TRACE]TRACE_NORMAL[0x86]_DUP14_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x150
+[TRACE]TRACE_NORMAL[0x86]_DUP14_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11e
 [TRACE]TRACE_NORMAL[0x86]_DUP15_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x151
+[TRACE]TRACE_NORMAL[0x86]_DUP15_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11f
 [TRACE]TRACE_NORMAL[0x86]_DUP16_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x152
+[TRACE]TRACE_NORMAL[0x86]_DUP16_CTHUMBNAILSTORE_STORETHUMBNAILL=0x120
 [TRACE]TRACE_NORMAL[0x86]_DUP17_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x153
+[TRACE]TRACE_NORMAL[0x86]_DUP17_CTHUMBNAILSTORE_STORETHUMBNAILL=0x121
 [TRACE]TRACE_NORMAL[0x86]_DUP18_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x154
+[TRACE]TRACE_NORMAL[0x86]_DUP18_CTHUMBNAILSTORE_STORETHUMBNAILL=0x122
 [TRACE]TRACE_NORMAL[0x86]_DUP19_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x155
 [TRACE]TRACE_NORMAL[0x86]_DUP19_CTHUMBNAILSTORE_PREPARESTATEMENTSL=0x108
+[TRACE]TRACE_NORMAL[0x86]_DUP19_CTHUMBNAILSTORE_STORETHUMBNAILL=0x123
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILDECODETASK_CTHUMBNAILDECODETASK=0x2
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILDECODETASK_STARTL=0x5
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILDECODETASK_THUMBNAILPROVIDERREADY=0x9
@@ -268,7 +252,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x3c
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILMEMORYCARDOBSERVER_CTHUMBNAILMEMORYCARDOBSERVER=0x47
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_CTHUMBNAILSCALETASK=0x4b
-[TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_ENCODEL=0x1e4
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_RUNL=0x54
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_STARTL=0x4d
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x58
@@ -367,7 +350,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILGENERATETASK_STARTL=0x24
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILGENERATETASK_THUMBNAILPROVIDERREADY=0x28
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x3d
-[TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILSCALETASK_ENCODEL=0x1e5
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILSCALETASK_RUNL=0x55
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILSCALETASK_STARTL=0x4e
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x59
@@ -424,7 +406,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILGENERATETASK_DOBLACKLISTING=0x36
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILGENERATETASK_THUMBNAILPROVIDERREADY=0x29
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x3e
-[TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILSCALETASK_ENCODEL=0x1e6
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILSCALETASK_STARTL=0x4f
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5a
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILSERVERSESSION_CREATEGENERATETASKFROMBUFFERL=0xd9
@@ -461,7 +442,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILGENERATETASK_CREATESCALETASKSL=0x2e
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILGENERATETASK_DOBLACKLISTING=0x37
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x3f
-[TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILSCALETASK_ENCODEL=0x1e7
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILSCALETASK_STARTL=0x50
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5b
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc1
@@ -489,7 +469,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILGENERATETASK_CREATESCALETASKSL=0x2f
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILGENERATETASK_DOBLACKLISTING=0x38
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x40
-[TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILSCALETASK_ENCODEL=0x1e8
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILSCALETASK_STARTL=0x51
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5c
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc3
@@ -507,7 +486,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILTASKPROCESSOR_RUNL=0x1b7
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTMACTIVITYMANAGER_RUNL=0x1c8
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILGENERATETASK_CREATESCALETASKSL=0x30
-[TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSCALETASK_ENCODEL=0x1e9
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSCALETASK_STARTL=0x52
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5d
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc4
@@ -523,10 +501,8 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSTORE_STORETHUMBNAILL=0x116
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTMACTIVITYMANAGER_RUNL=0x1ce
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILGENERATETASK_CREATESCALETASKSL=0x31
-[TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSCALETASK_ENCODEL=0x1ea
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5e
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc5
-[TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL=0x1f0
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSERVER_UPDATETHUMBNAILSL=0xa0
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSTOREDISKSPACENOTIFIERAO_RUNL=0x18c
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSTORE_CHECKMODIFIEDBYPATHL=0x173
@@ -535,17 +511,14 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x165
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSTORE_STORETHUMBNAILL=0x117
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTMACTIVITYMANAGER_RUNL=0x1cf
-[TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSCALETASK_ENCODEL=0x1eb
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5f
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc6
-[TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL=0x1f1
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSTORE_DELETETHUMBNAILSL=0x13c
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14a
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x166
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSTORE_STORETHUMBNAILL=0x118
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x60
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc7
-[TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL=0x1f2
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSTORE_DELETETHUMBNAILSL=0x13d
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14b
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x167
@@ -554,13 +527,4 @@
 [TRACE]TRACE_NORMAL[0x86]_RTHUMBNAILTRANSACTION_ROLLBACK=0xf2
 [TRACE]TRACE_NORMAL[0x86]__E32MAIN=0xa2
 [[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CTMACTIVITYMANAGER_NEWL=0x1bf
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11b
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11c
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP13_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11d
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP14_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11e
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP15_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11f
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP16_CTHUMBNAILSTORE_STORETHUMBNAILL=0x120
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP17_CTHUMBNAILSTORE_STORETHUMBNAILL=0x121
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP18_CTHUMBNAILSTORE_STORETHUMBNAILL=0x122
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP19_CTHUMBNAILSTORE_STORETHUMBNAILL=0x123
 [[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSERVER_CONSTRUCTL=0x62