[grisbi-cvs] grisbi/src fenetre_principale.c, 1.116, 1.117 fenetre_principale.h, 1.26, 1.27 gsb_scheduler_list.c, 1.68, 1.69 metatree.c, 1.137, 1.138 navigation.c, 1.124, 1.125

[Mickaël Remars]

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

Modified Files:
	fenetre_principale.c fenetre_principale.h gsb_scheduler_list.c 
	metatree.c navigation.c 
Log Message:
Partial fix of #592: do not hide/reset the balance just after displaying it when selecting an acount.

Index: metatree.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- metatree.c	9 Jun 2009 21:19:30 -0000	1.137
+++ metatree.c	11 Jun 2009 20:51:55 -0000	1.138
@@ -2275,7 +2275,8 @@
 							  iface -> tree_currency (), TRUE );
 	}
 
-	gsb_gui_headings_update ( text, balance );
+	gsb_gui_headings_update_title ( text );
+    gsb_gui_headings_update_suffix ( balance );
 	g_free ( text );
 	selection_is_set = TRUE;
     }

Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- fenetre_principale.c	11 Jun 2009 19:19:45 -0000	1.116
+++ fenetre_principale.c	11 Jun 2009 20:51:55 -0000	1.117
@@ -346,16 +346,14 @@
 }
 
 /**
- * Update headings bar with a new title and a new suffix.
+ * Update headings bar with a new title.
  *
  * \param title		String to display as a title in headings bar.
- * \param suffix	String to display as a suffix in headings bar.
  *
  */
-void gsb_gui_headings_update ( gchar * title, gchar * suffix )
+void gsb_gui_headings_update_title ( gchar * title )
 {
     gsb_gui_headings_private_update_label_markup ( GTK_LABEL(headings_title), title, TRUE );
-    gsb_gui_headings_update_suffix ( suffix );
 }
 
 /**

Index: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- navigation.c	26 May 2009 20:00:26 -0000	1.124
+++ navigation.c	11 Jun 2009 20:51:55 -0000	1.125
@@ -1112,8 +1112,8 @@
     GtkWidget * account_notebook;
     gint account_number, page_number;
     gint report_number;
-    gchar * title = NULL; 
-    gchar * suffix = NULL; 
+    gchar * title = NULL;
+    gboolean clear_sufix = TRUE;
 
     devel_debug (NULL);
 
@@ -1166,6 +1166,7 @@
 		title = g_strconcat ( _("Account"), " : ", gsb_data_account_get_name (account_number), NULL );
 		navigation_change_account ( GINT_TO_POINTER (account_number) );
 		gsb_account_property_fill_page ();
+		clear_sufix = FALSE;
 	    }
 	    gsb_menu_update_accounts_in_menus ();
 	    gsb_menu_update_view_menu ( account_number );
@@ -1287,12 +1288,11 @@
      * because gsb_navigation_update_account_label was called instead */
     if (title)
     {
-	if (!suffix)
-	    suffix = g_strdup("");
-	gsb_gui_headings_update ( title, suffix );
-	g_free ( suffix );
+	gsb_gui_headings_update_title ( title );
 	g_free ( title );
     }
+    if (clear_sufix)
+        gsb_gui_headings_update_suffix ( "" );
     return FALSE;
 }
 

Index: gsb_scheduler_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler_list.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- gsb_scheduler_list.c	9 Jun 2009 21:19:30 -0000	1.68
+++ gsb_scheduler_list.c	11 Jun 2009 20:51:55 -0000	1.69
@@ -1761,7 +1761,8 @@
 
     gchar* tmpstr = g_strconcat ( _("Scheduled transactions"), " : ",
 					    names[periodicity], NULL);
-    gsb_gui_headings_update ( tmpstr, "" );
+    gsb_gui_headings_update_title ( tmpstr );
+    gsb_gui_headings_update_suffix ( "" );
     g_free ( tmpstr );
 
     affichage_echeances = periodicity;

Index: fenetre_principale.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- fenetre_principale.h	7 Jun 2009 22:18:31 -0000	1.26
+++ fenetre_principale.h	11 Jun 2009 20:51:55 -0000	1.27
@@ -23,7 +23,7 @@
 
 /* START_DECLARATION */
 GtkWidget * create_main_widget ( void );
-void gsb_gui_headings_update ( gchar * title, gchar * suffix );
+void gsb_gui_headings_update_title ( gchar * title );
 void gsb_gui_headings_update_suffix ( gchar * suffix );
 void gsb_gui_notebook_change_page ( GsbGeneralNotebookPages page );
 void gsb_gui_sensitive_headings ( gboolean sensitive );