[grisbi-cvs] grisbi/src parametres.c,1.205,1.206

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4819

Modified Files:
	parametres.c 
Log Message:
correcting display of variables %s in tab messages and alerts

Index: parametres.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parametres.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- parametres.c	30 Aug 2009 17:59:48 -0000	1.205
+++ parametres.c	8 Sep 2009 20:43:48 -0000	1.206
@@ -96,6 +96,7 @@
 extern struct conditional_message messages[];
 extern gint nb_days_before_scheduled;
 extern gint nb_max_derniers_fichiers_ouverts;
+extern gchar *titre_fichier;
 extern GtkWidget *window;
 /*END_EXTERN*/
 
@@ -568,6 +569,7 @@
     GtkTreeModel * model;
     GtkCellRenderer * cell;
     GtkTreeViewColumn * column;
+    gchar *tmpstr;
     int i;
 
     vbox_pref = new_vbox_with_title_and_icon ( _("Messages & warnings"), "warnings.png" );
@@ -611,12 +613,21 @@
     {
         GtkTreeIter iter;
 
+        if ( g_utf8_collate ( messages[i].name, "account-already-opened" ) == 0 )
+            tmpstr = g_strdup_printf ( _(messages[i] . hint), titre_fichier );
+        else if ( g_utf8_collate ( messages[i].name, "development-version" ) == 0 )
+            tmpstr = g_strdup_printf ( _(messages[i] . hint), VERSION );
+        else
+            tmpstr = g_strdup ( _(messages[i] . hint) );
+
         gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
         gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
                         0, !messages[i] . hidden,
-                        1, _(messages[i] . hint),
+                        1, tmpstr,
                         2, i,
                         -1);
+
+        g_free ( tmpstr );
     }
 
     /* Show everything */