[grisbi-cvs] grisbi/src fenetre_principale.c,1.115,1.116

[Mickaël Remars]

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

Modified Files:
	fenetre_principale.c 
Log Message:
Partial fix of #592: do not display formating tags (on negative amounts) in title line. This was a side effect of the fix of #579.

Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- fenetre_principale.c	7 Jun 2009 22:18:31 -0000	1.115
+++ fenetre_principale.c	11 Jun 2009 19:19:45 -0000	1.116
@@ -45,7 +45,7 @@
 /*START_STATIC*/
 static GtkWidget *create_main_notebook (void );
 static gboolean gsb_gui_fill_main_notebook ( GtkWidget *notebook );
-static void gsb_gui_headings_private_update_label_markup ( GtkLabel *label, const gchar *text );
+static void gsb_gui_headings_private_update_label_markup ( GtkLabel *label, const gchar *text, gboolean escape_text );
 static gboolean gsb_gui_on_account_switch_page ( GtkNotebook *notebook,
 					  GtkNotebookPage *page,
 					  guint page_number,
@@ -335,13 +335,14 @@
  * \param text	String to display in headings bar.
  *
  */
-void gsb_gui_headings_private_update_label_markup ( GtkLabel *label, const gchar *text )
+void gsb_gui_headings_private_update_label_markup ( GtkLabel *label, const gchar *text, gboolean escape_text )
 {
-    gchar* escstr = g_markup_escape_text ( text, -1 );
+    const gchar* escstr = escape_text ? g_markup_escape_text ( text, -1 ) : text;
     gchar* tmpstr = g_strconcat ( "<b>", escstr, "</b>", NULL );
     gtk_label_set_markup ( label, tmpstr );
     g_free ( tmpstr );
-    g_free ( escstr );
+    if ( escape_text )
+        g_free ( (gchar*)escstr );
 }
 
 /**
@@ -353,7 +354,7 @@
  */
 void gsb_gui_headings_update ( gchar * title, gchar * suffix )
 {
-    gsb_gui_headings_private_update_label_markup ( GTK_LABEL(headings_title), title );
+    gsb_gui_headings_private_update_label_markup ( GTK_LABEL(headings_title), title, TRUE );
     gsb_gui_headings_update_suffix ( suffix );
 }
 
@@ -365,7 +366,7 @@
  */
 void gsb_gui_headings_update_suffix ( gchar * suffix )
 {
-    gsb_gui_headings_private_update_label_markup ( GTK_LABEL(headings_suffix), suffix );
+    gsb_gui_headings_private_update_label_markup ( GTK_LABEL(headings_suffix), suffix, FALSE );
 }