Index: Amaya.cleanup/thotlib/tree/tree.c
===================================================================
--- Amaya.cleanup.orig/thotlib/tree/tree.c	2007-10-17 21:58:21.000000000 +0100
+++ Amaya.cleanup/thotlib/tree/tree.c	2007-10-17 22:03:05.000000000 +0100
@@ -521,7 +521,7 @@
   BackSearchAttrInSubtree
   ----------------------------------------------------------------------*/
 static PtrElement BackSearch2AttrInSubtree (PtrElement pEl, int val,
-                                            char *textVal,
+                                            const char *textVal,
                                             int attNum, int attNum2,
                                             PtrSSchema pSS, PtrSSchema pSS2)
 {
@@ -1622,7 +1622,7 @@
   If attNum2 != 0 the search stops on the first attNum or attNum2 found.
   The function returns a pointer to the found element or NULL.
   ----------------------------------------------------------------------*/
-PtrElement FwdSearch2Attributes (PtrElement pEl, int val, char *textVal,
+PtrElement FwdSearch2Attributes (PtrElement pEl, int val, const char *textVal,
                                  int attNum, int attNum2, PtrSSchema pSS,
                                  PtrSSchema pSS2)
 {
@@ -1690,7 +1690,7 @@
   If attNum2 != 0 the search stops on the first attNum or attNum2 found.
   The function returns a pointer to the found element or NULL.   
   ----------------------------------------------------------------------*/
-PtrElement BackSearch2Attributes (PtrElement pEl, int val, char *textVal,
+PtrElement BackSearch2Attributes (PtrElement pEl, int val, const char *textVal,
                                   int attNum, int attNum2, PtrSSchema pSS,
                                   PtrSSchema pSS2)
 {
Index: Amaya.cleanup/thotlib/internals/f/tree_f.h
===================================================================
--- Amaya.cleanup.orig/thotlib/internals/f/tree_f.h	2007-10-17 21:59:28.000000000 +0100
+++ Amaya.cleanup/thotlib/internals/f/tree_f.h	2007-10-17 22:01:45.000000000 +0100
@@ -84,14 +84,14 @@
                                           int view );
 extern PtrElement FwdSearch2Attributes ( PtrElement pEl,
                                          int val,
-                                         char *textVal,
+                                         const char *textVal,
                                          int attNum,
                                          int attNum2,
                                          PtrSSchema pSS,
                                          PtrSSchema pSS2 );
 extern PtrElement BackSearch2Attributes ( PtrElement pEl,
                                           int val,
-                                          char *textVal,
+                                          const char *textVal,
                                           int attNum,
                                           int attNum2,
                                           PtrSSchema pSS,
@@ -306,14 +306,14 @@
                                             int view );
 extern PtrElement FwdSearch2Attributes ( PtrElement pEl,
                                            int val,
-                                           char *textVal,
+                                           const char *textVal,
                                            int attNum,
                                            int attNum2,
                                            PtrSSchema pSS,
                                            PtrSSchema pSS2 );
 extern PtrElement BackSearch2Attributes ( PtrElement pEl,
                                             int val,
-                                            char *textVal,
+                                            const char *textVal,
                                             int attNum,
                                             int attNum2,
                                             PtrSSchema pSS,
Index: Amaya.cleanup/thotlib/dialogue/dialogapi.c
===================================================================
--- Amaya.cleanup.orig/thotlib/dialogue/dialogapi.c	2007-10-17 22:31:14.000000000 +0100
+++ Amaya.cleanup/thotlib/dialogue/dialogapi.c	2007-10-17 22:31:40.000000000 +0100
@@ -704,7 +704,7 @@
 /*----------------------------------------------------------------------
   DisplayConfirmMessage displays the given message (text).
   ----------------------------------------------------------------------*/
-void DisplayConfirmMessage (char *text)
+void DisplayConfirmMessage (const char *text)
 {
 #ifdef _GTK
   ThotWidget          row, w;
Index: Amaya.cleanup/thotlib/internals/f/dialogapi_f.h
===================================================================
--- Amaya.cleanup.orig/thotlib/internals/f/dialogapi_f.h	2007-10-17 22:32:20.000000000 +0100
+++ Amaya.cleanup/thotlib/internals/f/dialogapi_f.h	2007-10-17 22:32:37.000000000 +0100
@@ -14,7 +14,7 @@
                               ThotAppContext *app_context );
 extern void InitDialogueFont ( void );
 extern int TtaGetReferencesBase ( int number );
-extern void DisplayConfirmMessage ( char *text );
+extern void DisplayConfirmMessage ( const char *text );
 extern void DisplayMessage ( char *text,
                              int msgType );
 extern int DestContenuMenu ( struct Cat_Context *catalogue );
@@ -198,7 +198,7 @@
                                 ThotAppContext *app_context );
 extern void InitDialogueFont ( void );
 extern int TtaGetReferencesBase ( int number );
-extern void DisplayConfirmMessage ( char *text );
+extern void DisplayConfirmMessage ( const char *text );
 extern void DisplayMessage ( char *text,
                                int msgType );
 extern int DestContenuMenu ( struct Cat_Context *catalogue );
Index: Amaya.cleanup/thotlib/base/batchmessage.c
===================================================================
--- Amaya.cleanup.orig/thotlib/base/batchmessage.c	2007-10-17 22:33:36.000000000 +0100
+++ Amaya.cleanup/thotlib/base/batchmessage.c	2007-10-17 22:33:50.000000000 +0100
@@ -24,7 +24,7 @@
 /*----------------------------------------------------------------------
    DisplayConfirmMessage displays the given message (text).        
   ----------------------------------------------------------------------*/
-void DisplayConfirmMessage (char *text)
+void DisplayConfirmMessage (const char *text)
 {
    fprintf (stderr, text);
 }
Index: Amaya.cleanup/thotlib/base/compilmsg.c
===================================================================
--- Amaya.cleanup.orig/thotlib/base/compilmsg.c	2007-10-17 22:34:54.000000000 +0100
+++ Amaya.cleanup/thotlib/base/compilmsg.c	2007-10-17 22:35:18.000000000 +0100
@@ -30,7 +30,7 @@
    DisplayConfirmMessage
    displays the given message (text).
   ----------------------------------------------------------------------*/
-void DisplayConfirmMessage (char *text)
+void DisplayConfirmMessage (const char *text)
 {
 #ifdef _WINGUI
   int ndx;
Index: Amaya.cleanup/thotlib/editing/print.c
===================================================================
--- Amaya.cleanup.orig/thotlib/editing/print.c	2007-10-17 22:35:58.000000000 +0100
+++ Amaya.cleanup/thotlib/editing/print.c	2007-10-17 22:36:11.000000000 +0100
@@ -2142,7 +2142,7 @@
   DisplayConfirmMessage
   displays the given message (text).
   ----------------------------------------------------------------------*/
-void DisplayConfirmMessage (char *text)
+void DisplayConfirmMessage (const char *text)
 {
 #ifdef _GTK
   gtk_window_set_title (GTK_WINDOW (window),text); 
Index: Amaya.cleanup/thotlib/internals/f/batchmessage_f.h
===================================================================
--- Amaya.cleanup.orig/thotlib/internals/f/batchmessage_f.h	2007-10-17 22:34:23.000000000 +0100
+++ Amaya.cleanup/thotlib/internals/f/batchmessage_f.h	2007-10-17 22:34:35.000000000 +0100
@@ -6,14 +6,14 @@
 #ifndef __CEXTRACT__
 #ifdef __STDC__
 
-extern void DisplayConfirmMessage ( char *text );
+extern void DisplayConfirmMessage ( const char *text );
 extern void DisplayMessage ( char *text,
                              int msgType );
 extern void TtaError ( int errorCode );
 
 #else /* __STDC__ */
 
-extern void DisplayConfirmMessage ( char *text );
+extern void DisplayConfirmMessage ( const char *text );
 extern void DisplayMessage ( char *text,
                                int msgType );
 extern void TtaError ( int errorCode );
Index: Amaya.cleanup/thotlib/internals/f/compilmsg_f.h
===================================================================
--- Amaya.cleanup.orig/thotlib/internals/f/compilmsg_f.h	2007-10-17 22:35:26.000000000 +0100
+++ Amaya.cleanup/thotlib/internals/f/compilmsg_f.h	2007-10-17 22:35:40.000000000 +0100
@@ -6,7 +6,7 @@
 #ifndef __CEXTRACT__
 #ifdef __STDC__
 
-extern void DisplayConfirmMessage ( char *text );
+extern void DisplayConfirmMessage ( const char *text );
 extern void DisplayMessage ( char *text,
                              int msgType );
 extern void TtaError ( int errorCode );
@@ -26,7 +26,7 @@
 
 #else /* __STDC__ */
 
-extern void DisplayConfirmMessage ( char *text );
+extern void DisplayConfirmMessage ( const char *text );
 extern void DisplayMessage ( char *text,
                                int msgType );
 extern void TtaError ( int errorCode );
Index: Amaya.cleanup/thotlib/internals/f/print_f.h
===================================================================
--- Amaya.cleanup.orig/thotlib/internals/f/print_f.h	2007-10-17 22:36:19.000000000 +0100
+++ Amaya.cleanup/thotlib/internals/f/print_f.h	2007-10-17 22:36:41.000000000 +0100
@@ -34,7 +34,7 @@
                                PtrAbstractBox rootAbsBox,
                                int clipOrg,
                                ThotBool last );
-extern void DisplayConfirmMessage ( char *text );
+extern void DisplayConfirmMessage ( const char *text );
 extern void DisplayMessage ( char *text,
                              int msgType );
 extern void TtaError ( int errorCode );
@@ -71,7 +71,7 @@
                                  PtrAbstractBox rootAbsBox,
                                  int clipOrg,
                                  ThotBool last );
-extern void DisplayConfirmMessage ( char *text );
+extern void DisplayConfirmMessage ( const char *text );
 extern void DisplayMessage ( char *text,
                                int msgType );
 extern void TtaError ( int errorCode );
Index: Amaya.cleanup/thotlib/dialogue/input.c
===================================================================
--- Amaya.cleanup.orig/thotlib/dialogue/input.c	2007-10-17 22:42:04.000000000 +0100
+++ Amaya.cleanup/thotlib/dialogue/input.c	2007-10-17 22:44:22.000000000 +0100
@@ -199,7 +199,7 @@
 /*----------------------------------------------------------------------
   KeyName translates a key value into a key name.
   ----------------------------------------------------------------------*/
-static char *KeyName (unsigned int key)
+static const char *KeyName (unsigned int key)
 {
   static char s[2];
 
@@ -1541,7 +1541,8 @@
 void TtaListShortcuts (Document doc, FILE *fileDescriptor)
 {
   KEY                *next, *ptr;
-  char               *s, *k1, sk1[10], *k2;
+  char               *s, sk1[10];
+  const char         *k1, *k2;
   int                 i;
 
   s = TtaGetEnvString ("ACCESSKEY_MOD");