[grisbi-cvs] grisbi/src balance_estimate_hist.c, 1.5, 1.6 import_csv.c, 1.64, 1.65

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28371/src

Modified Files:
	balance_estimate_hist.c import_csv.c 
Log Message:
fixes a bug with importing a CSV file

Index: balance_estimate_hist.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_hist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- balance_estimate_hist.c	21 Feb 2010 20:48:38 -0000	1.5
+++ balance_estimate_hist.c	22 Feb 2010 20:11:29 -0000	1.6
@@ -118,6 +118,7 @@
     GtkWidget *button_1, *button_2;
     GtkWidget *tree_view;
     gchar *str_year;
+    gchar *title;
     gint year;
 
     devel_debug (NULL);
@@ -139,8 +140,12 @@
     gtk_box_pack_start ( GTK_BOX ( hbox ), vbox, FALSE, FALSE, 5) ;
 
     widget = gtk_label_new ( NULL );
-    gtk_label_set_markup ( GTK_LABEL ( widget ),
-                        _("Please Select the data source") );
+    title = g_strdup_printf (
+                        _("Please select the data source for the account: \"%s\""),
+                        gsb_data_account_get_name (
+                        bet_parameter_get_account_selected ( ) ) );
+    gtk_label_set_markup ( GTK_LABEL ( widget ), title );
+    g_free ( title );
     gtk_box_pack_start ( GTK_BOX ( vbox ), widget, FALSE, FALSE, 5 );
 
     /* Choix des données sources */
@@ -830,7 +835,7 @@
 
     div = sh -> div;
     div_name = bet_data_get_div_name ( div, 0, FALSE );
-    account_nb = sh -> account_nb;
+    account_nb = bet_parameter_get_account_selected ( );
 
     titre = g_object_get_data ( G_OBJECT ( bet_container ), "bet_historical_period" );
 

Index: import_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import_csv.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- import_csv.c	30 Jan 2010 08:16:49 -0000	1.64
+++ import_csv.c	22 Feb 2010 20:11:29 -0000	1.65
@@ -793,9 +793,6 @@
     gtk_combo_box_set_active ( GTK_COMBO_BOX(combobox), i );
     g_signal_handlers_unblock_by_func ( combobox, csv_import_combo_changed, entry );
 
-    if ( separator )
-        g_free ( separator );
-
     return FALSE;
 }