Merge lp:~ecx69/bellepoule/linux into lp:bellepoule

[betonniere]

[betonniere (betonniere)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2010-05-13 17:56:58 +0000
+++ Makefile	2011-01-21 08:07:55 +0000
@@ -11,11 +11,12 @@
 
 # Options de compilation, l'option -Wno-write-strings est utilisé car beaucoup de warnings
 # sur la conversion de chaines constantes en *gchar
-OPTS=-Wall -Wno-write-strings
+#OPTS=-Wall -Wno-write-strings   -Werror -pedantic-errors
+OPTS=-Wall -std=c++98 -pedantic
 OPTSDBG=$(OPTS) -g
 
 # Fichiers source à compiler et à linker, ATTENTION à mettre à jour la liste à chaque nouvelle version
-SRCS=attribute.cpp canvas.cpp canvas_module.cpp checkin.cpp classification.cpp contest.cpp data.cpp filter.cpp general_classification.cpp glade.cpp main.cpp match.cpp module.cpp object.cpp player.cpp players_list.cpp pool_allocator.cpp pool.cpp pool_match_order.cpp pool_supervisor.cpp schedule.cpp score_collector.cpp score.cpp sensitivity_trigger.cpp splitting.cpp stage.cpp table.cpp tournament.cpp
+SRCS=attendees.cpp attribute.cpp canvas.cpp canvas_module.cpp checkin.cpp classification.cpp contest.cpp data.cpp filter.cpp general_classification.cpp glade.cpp main.cpp match.cpp module.cpp object.cpp player.cpp players_list.cpp pool_allocator.cpp pool.cpp pool_match_order.cpp pool_supervisor.cpp schedule.cpp score_collector.cpp score.cpp sensitivity_trigger.cpp splitting.cpp stage.cpp swapper.cpp table.cpp tournament.cpp
 OBJS=$(SRCS:.cpp=.o)
 
 # Nom du fichier exécutable à générer dans $(DBGDIR) et $(RLSDIR)
@@ -29,7 +30,7 @@
 
 %.o: $(SRCDIR)/%.cpp
 	@mkdir -p $(OBJDIR)
-	@$(CC) -c $< -o $(OBJDIR)/$@ $(CFLAGS) $(OPTS)
+	@$(CC) -c $< -o $(OBJDIR)/$@ $(CFLAGS) $(OPTSDBG)
 
 .PHONY: clean
 clean:
 
=== modified file 'resources/glade/checkin.glade'
--- resources/glade/checkin.glade	2010-10-04 20:12:34 +0000
+++ resources/glade/checkin.glade	2011-01-21 08:07:55 +0000
@@ -274,7 +274,7 @@
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkHBox" id="hbox2">
+          <object class="GtkHBox" id="hbox4">
             <property name="visible">True</property>
             <child>
               <object class="GtkVBox" id="check_vbox">
 
=== modified file 'resources/glade/pool_supervisor.glade'
--- resources/glade/pool_supervisor.glade	2010-12-19 17:35:40 +0000
+++ resources/glade/pool_supervisor.glade	2011-01-21 08:07:55 +0000
@@ -318,7 +318,7 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAspectFrame" id="aspectframe1">
+              <object class="GtkAspectFrame" id="aspectframe3">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
@@ -358,7 +358,7 @@
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;b&gt;What?&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
@@ -417,7 +417,7 @@
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;b&gt;For what?&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
 
=== modified file 'resources/glade/table.glade'
--- resources/glade/table.glade	2010-12-19 17:35:40 +0000
+++ resources/glade/table.glade	2011-01-21 08:07:55 +0000
@@ -530,7 +530,7 @@
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkAspectFrame" id="aspectframe1">
+          <object class="GtkAspectFrame" id="aspectframe4">
             <property name="visible">True</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
 
=== modified file 'sources/attribute.cpp'
--- sources/attribute.cpp	2010-12-13 21:03:47 +0000
+++ sources/attribute.cpp	2011-01-21 08:07:55 +0000
@@ -23,7 +23,7 @@
 GSList *AttributeDesc::_list = NULL;
 
 // --------------------------------------------------------------------------------
-static gchar *GetUndivadableText (gchar *text)
+static gchar *GetUndivadableText (const gchar *text)
 {
   gchar *result = NULL;
 
@@ -31,7 +31,7 @@
   {
     guint  nb_space = 0;
 
-    for (gchar *current = text; *current != 0; current++)
+    for (gchar *current = (gchar *) text; *current != 0; current++)
     {
       if (*current == ' ')
       {
@@ -67,16 +67,16 @@
 }
 
 // --------------------------------------------------------------------------------
-AttributeDesc::AttributeDesc (GType  type,
-                              gchar *code_name,
-                              gchar *xml_name,
-                              gchar *user_name)
+AttributeDesc::AttributeDesc (GType        type,
+                              const gchar *code_name,
+                              const gchar *xml_name,
+                              const gchar *user_name)
 : Object ("AttributeDesc")
 {
   _type               = type;
-  _code_name          = code_name;
-  _xml_name           = xml_name;
-  _user_name          = user_name;
+  _code_name          = g_strdup (code_name);
+  _xml_name           = g_strdup (xml_name);
+  _user_name          = g_strdup (user_name);
   _uniqueness         = SINGULAR;
   _persistency        = PERSISTENT;
   _scope              = GLOBAL;
@@ -98,6 +98,9 @@
   {
     g_object_unref (_discrete_store);
   }
+  g_free (_code_name);
+  g_free (_xml_name);
+  g_free (_user_name);
 }
 
 // --------------------------------------------------------------------------------
@@ -107,10 +110,10 @@
 }
 
 // --------------------------------------------------------------------------------
-AttributeDesc *AttributeDesc::Declare (GType  type,
-                                       gchar *code_name,
-                                       gchar *xml_name,
-                                       gchar *user_name)
+AttributeDesc *AttributeDesc::Declare (GType        type,
+                                       const gchar *code_name,
+                                       const gchar *xml_name,
+                                       gchar       *user_name)
 {
   AttributeDesc *attr_desc = new AttributeDesc (type,
                                                 code_name,
@@ -271,9 +274,9 @@
 }
 
 // --------------------------------------------------------------------------------
-void AttributeDesc::AddDiscreteValues (gchar *first_xml_image,
-                                       gchar *first_user_image,
-                                       gchar *first_icon,
+void AttributeDesc::AddDiscreteValues (const gchar *first_xml_image,
+                                       gchar       *first_user_image,
+                                       const gchar *first_icon,
                                        ...)
 {
   if (_discrete_store == NULL)
@@ -286,9 +289,9 @@
 
   {
     va_list  ap;
-    gchar   *xml_image  = first_xml_image;
+    gchar   *xml_image  = g_strdup (first_xml_image);
     gchar   *user_image = first_user_image;
-    gchar   *icon       = first_icon;
+    gchar   *icon       = g_strdup (first_icon);
 
     va_start (ap, first_icon);
     while (xml_image)
@@ -324,7 +327,7 @@
 }
 
 // --------------------------------------------------------------------------------
-void AttributeDesc::AddDiscreteValues (gchar *file)
+void AttributeDesc::AddDiscreteValues (const gchar *file)
 {
   if (_discrete_store == NULL)
   {
@@ -434,7 +437,7 @@
 }
 
 // --------------------------------------------------------------------------------
-AttributeDesc *AttributeDesc::GetDesc (gchar *name)
+AttributeDesc *AttributeDesc::GetDesc (const gchar *name)
 {
   for (guint i = 0; i < g_slist_length (_list); i++)
   {
@@ -554,7 +557,7 @@
 }
 
 // --------------------------------------------------------------------------------
-void TextAttribute::SetValue (gchar *value)
+void TextAttribute::SetValue (const gchar *value)
 {
   if (value)
   {
@@ -648,7 +651,7 @@
 }
 
 // --------------------------------------------------------------------------------
-void BooleanAttribute::SetValue (gchar *value)
+void BooleanAttribute::SetValue (const gchar *value)
 {
   if (value)
   {
@@ -726,7 +729,7 @@
 }
 
 // --------------------------------------------------------------------------------
-void IntAttribute::SetValue (gchar *value)
+void IntAttribute::SetValue (const gchar *value)
 {
   if (value)
   {
 
=== modified file 'sources/attribute.hpp'
--- sources/attribute.hpp	2010-12-13 21:03:47 +0000
+++ sources/attribute.hpp	2011-01-21 08:07:55 +0000
@@ -72,28 +72,28 @@
 
     static void SetPath (gchar *path);
 
-    static AttributeDesc *Declare (GType  type,
-                                   gchar *code_name,
-                                   gchar *xml_name,
-                                   gchar *user_name);
+    static AttributeDesc *Declare (GType        type,
+                                   const gchar *code_name,
+                                   const gchar *xml_name,
+                                   gchar       *user_name);
 
     static void CreateList (GSList **list, ...);
 
     static GSList *GetList ();
 
-    static AttributeDesc *GetDesc (gchar *name);
+    static AttributeDesc *GetDesc (const gchar *name);
 
     void BindDiscreteValues (GObject         *object,
                              GtkCellRenderer *renderer = NULL);
 
     gboolean HasDiscreteValue ();
 
-    void AddDiscreteValues (gchar *first_xml_image,
-                            gchar *first_user_image,
-                            gchar *first_icon,
+    void AddDiscreteValues (const gchar *first_xml_image,
+                            gchar       *first_user_image,
+                            const gchar *first_icon,
                             ...);
 
-    void AddDiscreteValues (gchar *file);
+    void AddDiscreteValues (const gchar *file);
 
     void *GetDiscreteValue (guint from_code);
 
@@ -107,10 +107,10 @@
     static gchar  *_path;
     static GSList *_list;
 
-    AttributeDesc (GType  type,
-                   gchar *code_name,
-                   gchar *xml_name,
-                   gchar *user_name);
+    AttributeDesc (GType        type,
+                   const gchar *code_name,
+                   const gchar *xml_name,
+                   const gchar *user_name);
 
     ~AttributeDesc ();
 };
@@ -132,7 +132,7 @@
 
     GType GetType ();
 
-    virtual void SetValue (gchar *value) = 0;
+    virtual void SetValue (const gchar *value) = 0;
 
     virtual void SetValue (guint value) = 0;
 
@@ -170,7 +170,7 @@
 
     virtual ~TextAttribute ();
 
-    void SetValue (gchar *value);
+    void SetValue (const gchar *value);
 
     void SetValue (guint value);
 
@@ -201,7 +201,7 @@
 
     virtual ~BooleanAttribute ();
 
-    void SetValue (gchar *value);
+    void SetValue (const gchar *value);
 
     void SetValue (guint value);
 
@@ -231,7 +231,7 @@
 
     virtual ~IntAttribute ();
 
-    void SetValue (gchar *value);
+    void SetValue (const gchar *value);
 
     void SetValue (guint value);
 
 
=== modified file 'sources/canvas.cpp'
--- sources/canvas.cpp	2010-12-13 21:03:47 +0000
+++ sources/canvas.cpp	2011-01-21 08:07:55 +0000
@@ -37,7 +37,7 @@
 
 // --------------------------------------------------------------------------------
 void Canvas::SetTableItemAttribute (GooCanvasItem *item,
-                                    gchar         *attribute,
+                                    const gchar   *attribute,
                                     gdouble        value)
 {
   GooCanvasItem *parent = goo_canvas_item_get_parent (item);
@@ -54,7 +54,7 @@
 
 // --------------------------------------------------------------------------------
 void Canvas::SetTableItemAttribute (GooCanvasItem *item,
-                                    gchar         *attribute,
+                                    const gchar    *attribute,
                                     guint          value)
 {
   GooCanvasItem *parent = goo_canvas_item_get_parent (item);
@@ -71,7 +71,7 @@
 
 // --------------------------------------------------------------------------------
 GooCanvasItem *Canvas::PutTextInTable (GooCanvasItem *table,
-                                       gchar         *text,
+                                       const gchar   *text,
                                        guint          row,
                                        guint          column)
 {
@@ -108,7 +108,7 @@
 
 // --------------------------------------------------------------------------------
 GooCanvasItem *Canvas::CreateIcon (GooCanvasItem *parent,
-                                   gchar         *icon_name,
+                                   const gchar   *icon_name,
                                    gdouble        x,
                                    gdouble        y)
 {
@@ -138,7 +138,7 @@
 
 // --------------------------------------------------------------------------------
 GooCanvasItem *Canvas::PutStockIconInTable (GooCanvasItem *table,
-                                            gchar         *icon_name,
+                                            const gchar   *icon_name,
                                             guint          row,
                                             guint          column)
 {
 
=== modified file 'sources/canvas.hpp'
--- sources/canvas.hpp	2010-12-13 21:03:47 +0000
+++ sources/canvas.hpp	2011-01-21 08:07:55 +0000
@@ -31,12 +31,12 @@
                             guint          column);
 
     static GooCanvasItem *PutTextInTable (GooCanvasItem *table,
-                                          gchar         *text,
+                                          const gchar   *text,
                                           guint          row,
                                           guint          column);
 
     static GooCanvasItem *CreateIcon (GooCanvasItem *parent,
-                                      gchar         *icon_name,
+                                      const gchar   *icon_name,
                                       gdouble        x,
                                       gdouble        y);
 
@@ -46,16 +46,16 @@
                                           guint          column);
 
     static GooCanvasItem *PutStockIconInTable (GooCanvasItem *table,
-                                               gchar         *icon_name,
+                                               const gchar   *icon_name,
                                                guint          row,
                                                guint          column);
 
     static void SetTableItemAttribute (GooCanvasItem *item,
-                                       gchar         *attribute,
+                                       const gchar   *attribute,
                                        guint          value);
 
     static void SetTableItemAttribute (GooCanvasItem *item,
-                                       gchar         *attribute,
+                                       const gchar   *attribute,
                                        gdouble        value);
 
     static GooCanvas *CreatePrinterCanvas (GtkPrintContext *context);
 
=== modified file 'sources/canvas_module.cpp'
--- sources/canvas_module.cpp	2010-12-19 17:35:40 +0000
+++ sources/canvas_module.cpp	2011-01-21 08:07:55 +0000
@@ -25,8 +25,8 @@
 #include "canvas_module.hpp"
 
 // --------------------------------------------------------------------------------
-CanvasModule::CanvasModule (gchar *glade_file,
-                            gchar *root)
+CanvasModule::CanvasModule (const gchar *glade_file,
+                            const gchar *root)
 : Module (glade_file,
           root)
 {
 
=== modified file 'sources/canvas_module.hpp'
--- sources/canvas_module.hpp	2010-05-17 12:24:43 +0000
+++ sources/canvas_module.hpp	2011-01-21 08:07:55 +0000
@@ -26,8 +26,8 @@
 class CanvasModule : public Module
 {
   protected:
-    CanvasModule (gchar *glade_file,
-                  gchar *root = NULL);
+    CanvasModule (const gchar *glade_file,
+                  const gchar *root = NULL);
     virtual ~CanvasModule ();
 
     static void WipeItem (GooCanvasItem *item);
 
=== modified file 'sources/checkin.cpp'
--- sources/checkin.cpp	2010-12-02 21:35:29 +0000
+++ sources/checkin.cpp	2011-01-21 08:07:55 +0000
@@ -264,7 +264,7 @@
 
 // --------------------------------------------------------------------------------
 void Checkin::Load (xmlXPathContext *xml_context,
-                    gchar           *from_node)
+                    const gchar     *from_node)
 {
   gchar          *path        = g_strdup_printf ("%s/Tireurs", from_node);
   xmlXPathObject *xml_object  = xmlXPathEval (BAD_CAST path, xml_context);
@@ -778,24 +778,24 @@
 
           player = new Player;
 
-          attr_id._name = "attending";
+          attr_id._name = (gchar *) "attending";
           player->SetAttributeValue (&attr_id, (guint) FALSE);
 
           if (tokens)
           {
-            attr_id._name = "name";
+            attr_id._name = (gchar *) "name";
             player->SetAttributeValue (&attr_id, tokens[0]);
 
-            attr_id._name = "first_name";
+            attr_id._name = (gchar *) "first_name";
             player->SetAttributeValue (&attr_id, tokens[1]);
 
-            attr_id._name = "birth_date";
+            attr_id._name = (gchar *) "birth_date";
             player->SetAttributeValue (&attr_id, tokens[2]);
 
-            attr_id._name = "gender";
+            attr_id._name = (gchar *) "gender";
             player->SetAttributeValue (&attr_id, tokens[3]);
 
-            attr_id._name = "country";
+            attr_id._name = (gchar *) "country";
             player->SetAttributeValue (&attr_id, tokens[4]);
 
             g_strfreev (tokens);
@@ -815,7 +815,7 @@
                                            0);
           if (tokens)
           {
-            attr_id._name = "licence";
+            attr_id._name = (gchar *) "licence";
             player->SetAttributeValue (&attr_id, tokens[0]);
 
             if (strlen (tokens[0]) > 2)
@@ -830,27 +830,27 @@
 
                 if (league)
                 {
-                  attr_id._name = "league";
+                  attr_id._name = (gchar *) "league";
                   player->SetAttributeValue (&attr_id, league);
                   g_free (league);
                 }
               }
             }
 
-            attr_id._name = "club";
+            attr_id._name = (gchar *) "club";
             player->SetAttributeValue (&attr_id, tokens[2]);
 
-            attr_id._name = "exported";
+            attr_id._name = (gchar *) "exported";
             player->SetAttributeValue (&attr_id, (guint) FALSE);
 
             if (tokens[3] == NULL)
             {
-              attr_id._name = "rating";
+              attr_id._name = (gchar *) "rating";
               player->SetAttributeValue (&attr_id, (guint) 0);
             }
             else
             {
-              attr_id._name = "rating";
+              attr_id._name = (gchar *) "rating";
               player->SetAttributeValue (&attr_id, tokens[3]);
             }
 
@@ -922,16 +922,16 @@
           Player              *player = new Player;
           Player::AttributeId  attr_id ("");
 
-          attr_id._name = "attending";
+          attr_id._name = (gchar *) "attending";
           player->SetAttributeValue (&attr_id, (guint) FALSE);
 
-          attr_id._name = "name";
+          attr_id._name = (gchar *) "name";
           player->SetAttributeValue (&attr_id, tokens[i]);
 
-          attr_id._name = "first_name";
+          attr_id._name = (gchar *) "first_name";
           player->SetAttributeValue (&attr_id, tokens[i+1]);
 
-          attr_id._name = "exported";
+          attr_id._name = (gchar *) "exported";
           player->SetAttributeValue (&attr_id, (guint) FALSE);
 
 
 
=== modified file 'sources/checkin.hpp'
--- sources/checkin.hpp	2010-11-03 12:00:16 +0000
+++ sources/checkin.hpp	2011-01-21 08:07:55 +0000
@@ -72,7 +72,7 @@
     void Load (xmlNode *xml_node);
 
     void Load (xmlXPathContext *xml_context,
-               gchar           *from_node);
+               const gchar     *from_node);
 
     void Save (xmlTextWriter *xml_writer);
 
 
=== modified file 'sources/classification.cpp'
--- sources/classification.cpp	2010-12-09 21:33:26 +0000
+++ sources/classification.cpp	2011-01-21 08:07:55 +0000
@@ -245,9 +245,9 @@
 }
 
 // --------------------------------------------------------------------------------
-void Classification::WriteFFFString (FILE   *file,
-                                     Player *player,
-                                     gchar  *attr_name)
+void Classification::WriteFFFString (FILE        *file,
+                                     Player      *player,
+                                     const gchar *attr_name)
 {
   Player::AttributeId  attr_id (attr_name);
   Attribute           *attr = player->GetAttribute (&attr_id);
 
=== modified file 'sources/classification.hpp'
--- sources/classification.hpp	2010-11-30 22:28:25 +0000
+++ sources/classification.hpp	2011-01-21 08:07:55 +0000
@@ -43,9 +43,9 @@
   private:
     void OnPlugged ();
 
-    void WriteFFFString (FILE   *file,
-                         Player *player,
-                         gchar  *attr_name);
+    void WriteFFFString (FILE        *file,
+                         Player      *player,
+                         const gchar *attr_name);
 
     ~Classification ();
 };
 
=== modified file 'sources/contest.cpp'
--- sources/contest.cpp	2010-12-29 20:11:22 +0000
+++ sources/contest.cpp	2011-01-21 08:07:55 +0000
@@ -35,35 +35,35 @@
 
 #include "contest.hpp"
 
-gchar *Contest::weapon_image[_nb_weapon] =
+const gchar *Contest::weapon_image[_nb_weapon] =
 {
   N_ ("Sabre"),
   N_ ("Epée"),
   N_ ("Foil")
 };
 
-gchar *Contest::weapon_xml_image[_nb_weapon] =
+const gchar *Contest::weapon_xml_image[_nb_weapon] =
 {
   "S",
   "E",
   "F"
 };
 
-gchar *Contest::gender_image[_nb_gender] =
+const gchar *Contest::gender_image[_nb_gender] =
 {
   N_ ("Male"),
   N_ ("Female"),
   N_ ("Mixed")
 };
 
-gchar *Contest::gender_xml_image[_nb_gender] =
+const gchar *Contest::gender_xml_image[_nb_gender] =
 {
   "M",
   "F",
   "FM"
 };
 
-gchar *Contest::category_image[_nb_category] =
+const gchar *Contest::category_image[_nb_category] =
 {
   N_ ("U8"),
   N_ ("U10"),
@@ -75,7 +75,7 @@
   N_ ("Veteran")
 };
 
-gchar *Contest::category_xml_image[_nb_category] =
+const gchar *Contest::category_xml_image[_nb_category] =
 {
   "O",
   "P",
@@ -90,9 +90,9 @@
 GList *Contest::_color_list = NULL;
 
 // --------------------------------------------------------------------------------
-Contest::Time::Time (gchar *name)
+Contest::Time::Time (const gchar *name)
 {
-  _name = name;
+  _name = g_strdup (name);
   _hour   = 12;
   _minute = 0;
 }
@@ -104,12 +104,12 @@
 
 // --------------------------------------------------------------------------------
 void Contest::Time::Save (xmlTextWriter *xml_writer,
-                          gchar         *attr_name)
+                          const gchar   *attr_name)
 {
   xmlTextWriterWriteFormatAttribute (xml_writer,
                                      BAD_CAST attr_name,
                                      "%02d:%02d", _hour, _minute);
-};
+}
 
 // --------------------------------------------------------------------------------
 void Contest::Time::Load (gchar *attr)
@@ -971,8 +971,8 @@
 }
 
 // --------------------------------------------------------------------------------
-gchar *Contest::GetSaveFileName (gchar *title,
-                                 gchar *config_key)
+gchar *Contest::GetSaveFileName (gchar       *title,
+                                 const gchar *config_key)
 {
   GtkWidget *chooser;
   char      *filename = NULL;
@@ -1291,7 +1291,7 @@
 // --------------------------------------------------------------------------------
 gchar *Contest::GetGender ()
 {
-  return gender_xml_image[_gender];
+  return (char *) gender_xml_image[_gender];
 }
 
 // --------------------------------------------------------------------------------
 
=== modified file 'sources/contest.hpp'
--- sources/contest.hpp	2010-11-30 22:28:25 +0000
+++ sources/contest.hpp	2011-01-21 08:07:55 +0000
@@ -64,13 +64,13 @@
   private:
     struct Time : public Object
     {
-      Time (gchar *name);
+      Time (const gchar *name);
 
       ~Time ();
 
       void Load (gchar *attr);
       void Save (xmlTextWriter *xml_writer,
-                 gchar         *attr_name);
+                 const gchar   *attr_name);
       void ReadProperties (Glade *glade);
       void FillInProperties (Glade *glade);
       void Copy (Time *to);
@@ -81,16 +81,16 @@
     };
 
     static const guint _nb_weapon = 3;
-    static gchar *weapon_image[_nb_weapon];
-    static gchar *weapon_xml_image[_nb_weapon];
+    static const gchar *weapon_image[_nb_weapon];
+    static const gchar *weapon_xml_image[_nb_weapon];
 
     static const guint _nb_gender = 3;
-    static gchar *gender_image[_nb_gender];
-    static gchar *gender_xml_image[_nb_gender];
+    static const gchar *gender_image[_nb_gender];
+    static const gchar *gender_xml_image[_nb_gender];
 
     static const guint _nb_category = 8;
-    static gchar *category_image[_nb_category];
-    static gchar *category_xml_image[_nb_category];
+    static const gchar *category_image[_nb_category];
+    static const gchar *category_xml_image[_nb_category];
 
     static GList *_color_list;
 
@@ -126,8 +126,8 @@
     void   InitInstance      ();
     void   ReadProperties    ();
     void   DisplayProperties ();
-    gchar *GetSaveFileName   (gchar *title,
-                              gchar *config_key);
+    gchar *GetSaveFileName   (gchar       *title,
+                              const gchar *config_key);
     void   Save              (gchar *filename);
     void   FillInProperties  ();
     void   FillInDate        (guint day,
 
=== modified file 'sources/data.cpp'
--- sources/data.cpp	2010-07-10 20:17:09 +0000
+++ sources/data.cpp	2011-01-21 08:07:55 +0000
@@ -22,20 +22,20 @@
 #include "data.hpp"
 
 // --------------------------------------------------------------------------------
-Data::Data (gchar *xml_name,
-            guint  default_value)
+Data::Data (const gchar *xml_name,
+            guint        default_value)
 {
-  _xml_name = xml_name;
+  _xml_name = g_strdup (xml_name);
   _value    = default_value;
 
   _is_integer = TRUE;
 }
 
 // --------------------------------------------------------------------------------
-Data::Data (gchar *xml_name,
-            gchar *default_value)
+Data::Data (const gchar *xml_name,
+            gchar       *default_value)
 {
-  _xml_name = xml_name;
+  _xml_name = g_strdup (xml_name);
   _string   = default_value;
 
   _is_integer = FALSE;
@@ -44,6 +44,7 @@
 // --------------------------------------------------------------------------------
 Data::~Data ()
 {
+    g_free (_xml_name);
 }
 
 // --------------------------------------------------------------------------------
 
=== modified file 'sources/data.hpp'
--- sources/data.hpp	2010-07-10 20:17:09 +0000
+++ sources/data.hpp	2011-01-21 08:07:55 +0000
@@ -28,11 +28,11 @@
     guint  _value;
     gchar *_string;
 
-    Data (gchar *xml_name,
-          guint  default_value);
+    Data (const gchar *xml_name,
+          guint        default_value);
 
-    Data (gchar *xml_name,
-          gchar *default_value);
+    Data (const gchar *xml_name,
+          gchar       *default_value);
 
     void Save (xmlTextWriter *xml_writer);
 
 
=== modified file 'sources/filter.cpp'
--- sources/filter.cpp	2010-10-07 11:38:36 +0000
+++ sources/filter.cpp	2011-01-21 08:07:55 +0000
@@ -81,7 +81,7 @@
 }
 
 // --------------------------------------------------------------------------------
-guint Filter::GetAttributeId (gchar *name)
+guint Filter::GetAttributeId (const gchar *name)
 {
   if (_attr_list)
   {
@@ -118,7 +118,7 @@
 }
 
 // --------------------------------------------------------------------------------
-void Filter::ShowAttribute (gchar *name)
+void Filter::ShowAttribute (const gchar *name)
 {
   GtkTreeIter  iter;
   GtkTreeIter *sibling = NULL;
 
=== modified file 'sources/filter.hpp'
--- sources/filter.hpp	2010-06-25 21:16:12 +0000
+++ sources/filter.hpp	2011-01-21 08:07:55 +0000
@@ -31,7 +31,7 @@
 
     void SetAttributeList (GSList *list);
 
-    void ShowAttribute (gchar *name);
+    void ShowAttribute (const gchar *name);
 
     void UpdateAttrList ();
 
@@ -41,7 +41,7 @@
 
     GSList *GetSelectedAttrList ();
 
-    guint GetAttributeId (gchar *name);
+    guint GetAttributeId (const gchar *name);
 
     void SetOwner (Module *owner);
 
 
=== modified file 'sources/general_classification.cpp'
--- sources/general_classification.cpp	2010-12-29 07:36:17 +0000
+++ sources/general_classification.cpp	2011-01-21 08:07:55 +0000
@@ -265,11 +265,11 @@
 
         if (export_type == CSV)
         {
-          suffix = ".csv";
+          suffix = g_strdup (".csv");
         }
         else
         {
-          suffix = ".fff";
+          suffix = g_strdup (".fff");
         }
 
         {
@@ -300,6 +300,7 @@
             g_free (dirname);
           }
         }
+        g_free (suffix);
       }
     }
 
 
=== modified file 'sources/glade.cpp'
--- sources/glade.cpp	2010-09-05 20:04:10 +0000
+++ sources/glade.cpp	2011-01-21 08:07:55 +0000
@@ -19,8 +19,8 @@
 gchar *Glade::_path = NULL;
 
 // --------------------------------------------------------------------------------
-Glade::Glade (gchar  *file_name,
-              Object *owner)
+Glade::Glade (const gchar *file_name,
+              Object      *owner)
 : Object ("Glade")
 {
   if (file_name)
@@ -33,6 +33,10 @@
     gtk_builder_add_from_file (_glade_xml,
                                path,
                                &error);
+    if (error != NULL)
+    {
+      g_print ("<<%s>> %s\n", path, error->message);
+    }
     g_free (path);
 
     if (error != NULL)
@@ -94,14 +98,14 @@
 }
 
 // --------------------------------------------------------------------------------
-GtkWidget *Glade::GetWidget (gchar *name)
+GtkWidget *Glade::GetWidget (const gchar *name)
 {
   return (GtkWidget *) (gtk_builder_get_object (_glade_xml,
                                                 name));
 }
 
 // --------------------------------------------------------------------------------
-GObject *Glade::GetObject (gchar *name)
+GObject *Glade::GetObject (const gchar *name)
 {
   return gtk_builder_get_object (_glade_xml,
                                  name);
 
=== modified file 'sources/glade.hpp'
--- sources/glade.hpp	2010-04-18 21:11:47 +0000
+++ sources/glade.hpp	2011-01-21 08:07:55 +0000
@@ -23,15 +23,15 @@
 class Glade : public Object
 {
   public:
-     Glade (gchar  *file_name,
-            Object *owner);
+     Glade (const gchar *file_name,
+            Object      *owner);
     ~Glade ();
 
     static void SetPath (gchar *path);
 
     GtkWidget *GetRootWidget    ();
-    GtkWidget *GetWidget        (gchar *name);
-    GObject   *GetObject        (gchar *name);
+    GtkWidget *GetWidget        (const gchar *name);
+    GObject   *GetObject        (const gchar *name);
     void       DetachFromParent (GtkWidget *widget);
 
   private:
 
=== modified file 'sources/main.cpp'
--- sources/main.cpp	2011-01-04 22:21:11 +0000
+++ sources/main.cpp	2011-01-21 08:07:55 +0000
@@ -40,6 +40,7 @@
 #include "attribute.hpp"
 #include "general_classification.hpp"
 #include "glade.hpp"
+#include "locale"
 
 // --------------------------------------------------------------------------------
 static void AboutDialogActivateLinkFunc (GtkAboutDialog *about,
 
=== modified file 'sources/module.cpp'
--- sources/module.cpp	2010-12-13 21:03:47 +0000
+++ sources/module.cpp	2011-01-21 08:07:55 +0000
@@ -22,12 +22,14 @@
 
 #include "module.hpp"
 
+const gdouble Module::PRINT_HEADER_HEIGHT = 10.0; // % of paper width
+const gdouble Module::PRINT_FONT_HEIGHT   = 2.0;  // % of paper width
 GKeyFile     *Module::_config_file  = NULL;
 GtkTreeModel *Module::_status_model = NULL;
 
 // --------------------------------------------------------------------------------
-Module::Module (gchar *glade_file,
-                gchar *root)
+Module::Module (const gchar *glade_file,
+                const gchar *root)
 //: Object ("Module")
 {
   _plugged_list = NULL;
@@ -115,7 +117,7 @@
 }
 
 // --------------------------------------------------------------------------------
-GtkWidget *Module::GetWidget (gchar *name)
+GtkWidget *Module::GetWidget (const gchar *name)
 {
   return _glade->GetWidget (name);
 }
 
=== modified file 'sources/module.hpp'
--- sources/module.hpp	2010-12-13 21:03:47 +0000
+++ sources/module.hpp	2011-01-21 08:07:55 +0000
@@ -47,7 +47,7 @@
 
     GtkWidget *GetRootWidget ();
 
-    GtkWidget *GetWidget (gchar *name);
+    GtkWidget *GetWidget (const gchar *name);
 
     virtual void SetFilter (Filter *filter);
 
@@ -57,13 +57,13 @@
     Filter  *_filter;
     Glade   *_glade;
 
-    static const gdouble PRINT_HEADER_HEIGHT = 10.0; // % of paper width
-    static const gdouble PRINT_FONT_HEIGHT   = 2.0;  // % of paper width
+    static const gdouble PRINT_HEADER_HEIGHT;
+    static const gdouble PRINT_FONT_HEIGHT;
 
     static GKeyFile *_config_file;
 
-    Module (gchar *glade_file,
-            gchar *root = NULL);
+    Module (const gchar *glade_file,
+            const gchar *root = NULL);
 
     virtual void OnPlugged   () {};
     virtual void OnUnPlugged () {};
 
=== modified file 'sources/object.cpp'
--- sources/object.cpp	2010-06-30 21:14:15 +0000
+++ sources/object.cpp	2011-01-21 08:07:55 +0000
@@ -28,7 +28,7 @@
 };
 
 // --------------------------------------------------------------------------------
-Object::Object (gchar *class_name)
+Object::Object (const gchar *class_name)
 {
   g_datalist_init (&_datalist);
   _ref_count = 1;
@@ -37,10 +37,12 @@
 #ifdef DEBUG
   if (class_name == NULL)
   {
-    class_name = "anonymous";
-  }
-
-  _class_name = class_name;
+    _class_name = g_strdup ("anonymous");
+  }
+  else
+  {
+    _class_name = g_strdup (class_name);
+  }
 
   for (guint i = 0; i < g_list_length (_list); i++)
   {
@@ -90,6 +92,9 @@
       return;
     }
   }
+
+  g_free (_class_name);
+
 #endif
 }
 
@@ -130,11 +135,11 @@
 
 // --------------------------------------------------------------------------------
 void Object::SetData (Object         *owner,
-                      gchar          *key,
+                      const gchar    *key,
                       void           *data,
                       GDestroyNotify  destroy_cbk)
 {
-  gchar *full_key = g_strdup_printf ("%p::%s", owner, key);
+  gchar *full_key = g_strdup_printf ("%p::%s", (void *) owner, key);
 
   g_datalist_set_data_full (&_datalist,
                             full_key,
@@ -144,10 +149,10 @@
 }
 
 // --------------------------------------------------------------------------------
-void Object::RemoveData (Object *owner,
-                         gchar  *key)
+void Object::RemoveData (Object      *owner,
+                         const gchar *key)
 {
-  gchar *full_key = g_strdup_printf ("%p::%s", owner, key);
+  gchar *full_key = g_strdup_printf ("%p::%s", (void *) owner, key);
 
   g_datalist_remove_data (&_datalist,
                           full_key);
@@ -165,11 +170,11 @@
 }
 
 // --------------------------------------------------------------------------------
-void *Object::GetData (Object *owner,
-                       gchar  *key)
+void *Object::GetData (Object      *owner,
+                       const gchar *key)
 {
   void  *data;
-  gchar *full_key = g_strdup_printf ("%p::%s", owner, key);
+  gchar *full_key = g_strdup_printf ("%p::%s", (void *) owner, key);
 
   data = g_datalist_get_data (&_datalist,
                               full_key);
 
=== modified file 'sources/object.hpp'
--- sources/object.hpp	2010-09-21 12:47:35 +0000
+++ sources/object.hpp	2011-01-21 08:07:55 +0000
@@ -24,18 +24,18 @@
 class Object
 {
   public:
-    Object (gchar *class_name = NULL);
+    Object (const gchar *class_name = NULL);
 
     void SetData (Object         *owner,
-                  gchar          *key,
+                  const gchar    *key,
                   void           *data,
                   GDestroyNotify  destroy_cbk = NULL);
 
-    void *GetData (Object *owner,
-                   gchar  *key);
+    void *GetData (Object      *owner,
+                   const gchar *key);
 
-    void RemoveData (Object *owner,
-                     gchar  *key);
+    void RemoveData (Object      *owner,
+                     const gchar *key);
 
     void Retain ();
 
 
=== modified file 'sources/player.cpp'
--- sources/player.cpp	2010-12-02 21:35:29 +0000
+++ sources/player.cpp	2011-01-21 08:07:55 +0000
@@ -167,13 +167,13 @@
 }
 
 // --------------------------------------------------------------------------------
-void Player::SetChangeCbk (gchar    *attr_name,
-                           OnChange  change_cbk,
-                           void     *data)
+void Player::SetChangeCbk (const gchar *attr_name,
+                           OnChange     change_cbk,
+                           void        *data)
 {
   Client *client = new Client;
 
-  client->_attr_name  = attr_name;
+  client->_attr_name  = g_strdup (attr_name);
   client->_change_cbk = change_cbk;
   client->_data       = data;
 
@@ -203,7 +203,7 @@
 
 // --------------------------------------------------------------------------------
 void Player::SetAttributeValue (AttributeId *attr_id,
-                                gchar       *value)
+                                const gchar *value)
 {
   Attribute *attr = GetAttribute (attr_id);
 
 
=== modified file 'sources/player.hpp'
--- sources/player.hpp	2010-10-13 13:09:59 +0000
+++ sources/player.hpp	2011-01-21 08:07:55 +0000
@@ -29,10 +29,10 @@
     class AttributeId : public Object
     {
       public:
-        AttributeId (gchar   *name,
-                     Object  *owner = NULL)
+        AttributeId (const gchar *name,
+                     Object      *owner = NULL)
         {
-          _name      = name;
+          _name      = g_strdup (name);
           _owner     = owner;
           _rand_seed = 0;
         }
@@ -62,7 +62,7 @@
     Attribute *GetAttribute (AttributeId *attr_id);
 
     void SetAttributeValue (AttributeId *attr_id,
-                            gchar       *value);
+                            const gchar *value);
 
     void SetAttributeValue (AttributeId *attr_id,
                             guint        value);
@@ -75,9 +75,9 @@
 
     gchar *GetName ();
 
-    void SetChangeCbk (gchar    *attr_name,
-                       OnChange  change_cbk,
-                       void     *data);
+    void SetChangeCbk (const gchar *attr_name,
+                       OnChange     change_cbk,
+                       void        *data);
 
     static gint CompareWithRef (Player *player,
                                 guint   ref);
 
=== modified file 'sources/players_list.cpp'
--- sources/players_list.cpp	2010-11-30 07:58:46 +0000
+++ sources/players_list.cpp	2011-01-21 08:07:55 +0000
@@ -25,8 +25,8 @@
 #include "players_list.hpp"
 
 // --------------------------------------------------------------------------------
-  PlayersList::PlayersList (gchar *glade_file,
-                            guint  rights)
+  PlayersList::PlayersList (const gchar *glade_file,
+                            guint        rights)
 : Module (glade_file)
 {
   _rights       = rights;
@@ -494,8 +494,8 @@
 }
 
 // --------------------------------------------------------------------------------
-void PlayersList::SetAttributeRight (gchar    *name,
-                                     gboolean  modifiable)
+void PlayersList::SetAttributeRight (const gchar *name,
+                                     gboolean     modifiable)
 {
   AttributeDesc *desc = AttributeDesc::GetDesc (name);
 
 
=== modified file 'sources/players_list.hpp'
--- sources/players_list.hpp	2010-09-21 12:47:35 +0000
+++ sources/players_list.hpp	2011-01-21 08:07:55 +0000
@@ -40,8 +40,8 @@
 
     typedef gboolean (*CustomFilter) (Player *player);
 
-    PlayersList (gchar *glade_file,
-                 guint  rights = SORTABLE | MODIFIABLE);
+    PlayersList (const gchar *glade_file,
+                 guint        rights = SORTABLE | MODIFIABLE);
 
     ~PlayersList ();
 
@@ -59,8 +59,8 @@
 
     void SetFilter (Filter *filter);
 
-    void SetAttributeRight (gchar    *name,
-                            gboolean  modifiable);
+    void SetAttributeRight (const gchar *name,
+                            gboolean     modifiable);
 
     virtual void OnListChanged () {};
 
 
=== modified file 'sources/pool.cpp'
--- sources/pool.cpp	2010-12-29 20:11:22 +0000
+++ sources/pool.cpp	2011-01-21 08:07:55 +0000
@@ -838,14 +838,14 @@
 }
 
 // --------------------------------------------------------------------------------
-void Pool::SetDisplayData (Player    *player,
-                           GooCanvas *on_canvas,
-                           gchar     *name,
-                           void      *value)
+void Pool::SetDisplayData (Player      *player,
+                           GooCanvas   *on_canvas,
+                           const gchar *name,
+                           void        *value)
 {
   player->SetData (GetDataOwner (), name, value);
 
-  _display_data = g_slist_prepend (_display_data, name);
+  _display_data = g_slist_prepend (_display_data, (void *) name);
 }
 
 // --------------------------------------------------------------------------------
@@ -921,19 +921,19 @@
     guint   HS_B;
     Player::AttributeId attr_id ("", data_owner);
 
-    attr_id._name = "victories_ratio";
+    attr_id._name = (gchar *) "victories_ratio";
     ratio_A = (guint) A->GetAttribute (&attr_id)->GetValue ();
     ratio_B = (guint) B->GetAttribute (&attr_id)->GetValue ();
 
-    attr_id._name = "indice";
+    attr_id._name = (gchar *) "indice";
     average_A = (gint)  A->GetAttribute (&attr_id)->GetValue ();
     average_B = (gint)  B->GetAttribute (&attr_id)->GetValue ();
 
-    attr_id._name = "HS";
+    attr_id._name = (gchar *) "HS";
     HS_A = (guint) A->GetAttribute (&attr_id)->GetValue ();
     HS_B = (guint) B->GetAttribute (&attr_id)->GetValue ();
 
-    attr_id._name = "status";
+    attr_id._name = (gchar *) "status";
     attr_id._owner = main_data_owner;
     if (A->GetAttribute (&attr_id) && B->GetAttribute (&attr_id))
     {
@@ -1195,7 +1195,7 @@
 
 // --------------------------------------------------------------------------------
 void Pool::RefreshAttribute (Player            *player,
-                             gchar             *name,
+                             const gchar       *name,
                              guint              value,
                              CombinedOperation  operation)
 {
@@ -1293,7 +1293,7 @@
         }
       }
 
-      attr_id._name = "victories_ratio";
+      attr_id._name = (gchar *) "victories_ratio";
       attr = player->GetAttribute (&attr_id);
       data = player->GetData (GetDataOwner (), "VictoriesRatioItem");
       if (data)
@@ -1318,7 +1318,7 @@
         g_free (text);
       }
 
-      attr_id._name = "HS";
+      attr_id._name = (gchar *) "HS";
       attr = player->GetAttribute (&attr_id);
       data = player->GetData (GetDataOwner (), "HSItem");
       if (data)
@@ -1343,7 +1343,7 @@
         g_free (text);
       }
 
-      attr_id._name = "indice";
+      attr_id._name = (gchar *) "indice";
       attr = player->GetAttribute (&attr_id);
       data = player->GetData (GetDataOwner (), "IndiceItem");
       if (data)
@@ -1452,7 +1452,7 @@
       xmlTextWriterWriteFormatAttribute (xml_writer,
                                          BAD_CAST "NbMatches",
                                          "%d", GetNbPlayers ()-1);
-      attr_id._name = "HS";
+      attr_id._name = (gchar *) "HS";
       attr = player->GetAttribute (&attr_id);
       if (attr)
       {
@@ -1460,7 +1460,7 @@
         xmlTextWriterWriteFormatAttribute (xml_writer,
                                            BAD_CAST "TD",
                                            "%d", HS);
-        attr_id._name = "indice";
+        attr_id._name = (gchar *) "indice";
         indice = (guint) player->GetAttribute (&attr_id)->GetValue ();
         xmlTextWriterWriteFormatAttribute (xml_writer,
                                            BAD_CAST "TR",
 
=== modified file 'sources/pool.hpp'
--- sources/pool.hpp	2010-12-09 21:33:26 +0000
+++ sources/pool.hpp	2011-01-21 08:07:55 +0000
@@ -130,10 +130,10 @@
 
     void OnUnPlugged ();
 
-    void SetDisplayData (Player    *player,
-                         GooCanvas *on_canvas,
-                         gchar     *name,
-                         void      *value);
+    void SetDisplayData (Player      *player,
+                         GooCanvas   *on_canvas,
+                         const gchar *name,
+                         void        *value);
 
     void Draw (GooCanvas *on_canvas,
                gboolean   print_for_referees);
@@ -151,7 +151,7 @@
     void RefreshDashBoard ();
 
     void RefreshAttribute (Player            *player,
-                           gchar             *name,
+                           const gchar       *name,
                            guint              value,
                            CombinedOperation  operation);
 
 
=== modified file 'sources/pool_allocator.cpp'
--- sources/pool_allocator.cpp	2010-12-14 13:21:36 +0000
+++ sources/pool_allocator.cpp	2011-01-21 08:07:55 +0000
@@ -1107,18 +1107,19 @@
           || (   _selected_config->has_two_size
               && ((pool_size == _selected_config->size)) || (pool_size == _selected_config->size + 1)))
       {
-        icon_name = GTK_STOCK_APPLY;
+        icon_name = g_strdup (GTK_STOCK_APPLY);
         pool->SetData (this, "is_balanced", (void *) 1);
       }
       else
       {
-        icon_name = GTK_STOCK_DIALOG_WARNING;
+        icon_name = g_strdup (GTK_STOCK_DIALOG_WARNING);
         pool->SetData (this, "is_balanced", 0);
       }
 
       Canvas::PutStockIconInTable (name_table,
                                    icon_name,
                                    0, 0);
+      g_free (icon_name);
     }
 
     // Name
 
=== modified file 'sources/score_collector.cpp'
--- sources/score_collector.cpp	2010-11-30 21:45:57 +0000
+++ sources/score_collector.cpp	2011-01-21 08:07:55 +0000
@@ -540,8 +540,8 @@
 }
 
 // --------------------------------------------------------------------------------
-void ScoreCollector::SetConsistentColors (gchar *normal_color,
-                                          gchar *focus_color)
+void ScoreCollector::SetConsistentColors (const gchar *normal_color,
+                                          const gchar *focus_color)
 {
   g_free (_consistent_normal_color);
   _consistent_normal_color = g_strdup (normal_color);
 
=== modified file 'sources/score_collector.hpp'
--- sources/score_collector.hpp	2010-04-18 21:11:47 +0000
+++ sources/score_collector.hpp	2011-01-21 08:07:55 +0000
@@ -61,8 +61,8 @@
     void SetNextCollectingPoint (GooCanvasItem *to,
                                  GooCanvasItem *next);
 
-    void SetConsistentColors (gchar *normal_color,
-                              gchar *focus_color);
+    void SetConsistentColors (const gchar *normal_color,
+                              const gchar *focus_color);
 
     void SetUnConsistentColors (gchar *normal_color,
                                 gchar *focus_colorg);
 
=== modified file 'sources/stage.hpp'
--- sources/stage.hpp	2010-11-17 11:21:48 +0000
+++ sources/stage.hpp	2011-01-21 08:07:55 +0000
@@ -125,7 +125,7 @@
     virtual void Load (xmlNode *xml_node);
 
     virtual void Load (xmlXPathContext *xml_context,
-                       gchar           *from_node) {};
+                       const gchar     *from_node) {};
 
     virtual void Save (xmlTextWriter *xml_writer) {};
 
 
=== modified file 'sources/table.cpp'
--- sources/table.cpp	2010-12-29 07:36:17 +0000
+++ sources/table.cpp	2011-01-21 08:07:55 +0000
@@ -29,6 +29,7 @@
 
 const gchar   *Table::_class_name     = N_("Table");
 const gchar   *Table::_xml_class_name = "PhaseDeTableaux";
+const gdouble  Table::_score_rect_size = 30.0;
 const gdouble  Table::_level_spacing  = 10.0;
 
 typedef enum
@@ -246,7 +247,7 @@
 }
 
 // --------------------------------------------------------------------------------
-GooCanvasItem *Table::GetQuickScore (gchar *container)
+GooCanvasItem *Table::GetQuickScore (const gchar *container)
 {
   GtkWidget     *view_port = _glade->GetWidget (container);
   GooCanvas     *canvas    = GOO_CANVAS (goo_canvas_new ());
@@ -317,15 +318,15 @@
 
       if (_level_status[i]._has_error)
       {
-        icon = GTK_STOCK_DIALOG_WARNING;
+        icon = g_strdup (GTK_STOCK_DIALOG_WARNING);
       }
       else if (_level_status[i]._is_over == TRUE)
       {
-        icon = GTK_STOCK_APPLY;
+        icon = g_strdup (GTK_STOCK_APPLY);
       }
       else
       {
-        icon = GTK_STOCK_EXECUTE;
+        icon = g_strdup (GTK_STOCK_EXECUTE);
       }
 
       _level_status[i]._status_item = Canvas::PutStockIconInTable (_level_status[i-nb_missing_level]._level_header,
@@ -339,6 +340,7 @@
       gtk_list_store_set (_from_table_liststore, &iter,
                           FROM_STATUS_COLUMN, icon,
                           -1);
+      g_free (icon);
     }
   }
   SignalStatusUpdate ();
@@ -954,7 +956,7 @@
 
               if (parent_data->_match->IsDropped () == FALSE)
               {
-                text = "Q";
+                text = (gchar *) "Q";
               }
               else
               {
 
=== modified file 'sources/table.hpp'
--- sources/table.hpp	2010-12-19 17:35:40 +0000
+++ sources/table.hpp	2011-01-21 08:07:55 +0000
@@ -60,7 +60,7 @@
                      gint               page_nr);
 
   private:
-    static const gdouble _score_rect_size = 30.0;
+    static const gdouble _score_rect_size;
 
     struct LevelStatus
     {
@@ -110,7 +110,7 @@
     guint               _print_nb_y_pages;
     GData              *_match_list;
 
-    GooCanvasItem *GetQuickScore (gchar *container);
+    GooCanvasItem *GetQuickScore (const gchar *container);
 
     void Display ();