[grisbi-cvs] grisbi/src affichage.c, 1.160, 1.161 affichage.h, 1.19, 1.20 fenetre_principale.c, 1.114, 1.115 fenetre_principale.h, 1.25, 1.26 gsb_data_account_cunit.c, 1.2, 1.3 gsb_data_account_cunit.h, 1.1, 1.2 gsb_data_bank.c, 1.11, 1.12 gsb_data_payee.h, 1.23, 1.24 gsb_data_reconcile.h, 1.10, 1.11 gsb_data_report.c, 1.30, 1.31 gsb_data_report_text_comparison.c, 1.14, 1.15 gsb_data_scheduled.c, 1.27, 1.28 gsb_file.c, 1.55, 1.56 gsb_file_save.c, 1.128, 1.129 metatree.h, 1.44, 1.45 transaction_list.c, 1.40, 1.41 transaction_list.h, 1.6, 1.7

Cedric Auger cedric_grisbi at users.sourceforge.net
Mon Jun 8 00:18:34 CEST 2009


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

Modified Files:
	affichage.c affichage.h fenetre_principale.c 
	fenetre_principale.h gsb_data_account_cunit.c 
	gsb_data_account_cunit.h gsb_data_bank.c gsb_data_payee.h 
	gsb_data_reconcile.h gsb_data_report.c 
	gsb_data_report_text_comparison.c gsb_data_scheduled.c 
	gsb_file.c gsb_file_save.c metatree.h transaction_list.c 
	transaction_list.h 
Log Message:
fix 551

Index: metatree.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- metatree.h	27 Apr 2009 19:41:03 -0000	1.44
+++ metatree.h	7 Jun 2009 22:18:31 -0000	1.45
@@ -115,7 +115,7 @@
 void metatree_set_linked_widgets_sensitive ( GtkTreeModel * model,
                         gboolean sensitive,
                         gchar * link_type );
-gboolean metatree_sort_column  ( GtkTreeModel * model,
+inline gboolean metatree_sort_column  ( GtkTreeModel * model,
                         GtkTreeIter * a, GtkTreeIter * b,
                         gpointer user_data );
 gboolean supprimer_division ( GtkTreeView * tree_view );

Index: gsb_file.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- gsb_file.c	6 Jun 2009 19:28:07 -0000	1.55
+++ gsb_file.c	7 Jun 2009 22:18:31 -0000	1.56
@@ -64,8 +64,8 @@
 /*START_STATIC*/
 static void gsb_file_append_name_to_opened_list ( gchar * path_fichier );
 static gboolean gsb_file_automatic_backup ( gpointer null );
-static gchar *gsb_file_dialog_ask_name ( void );
-static gint gsb_file_dialog_save ( void );
+static  gchar *gsb_file_dialog_ask_name ( void );
+static  gint gsb_file_dialog_save ( void );
 static gboolean gsb_file_save_backup ( void );
 static gboolean gsb_file_save_file ( gint origine );
 /*END_STATIC*/

Index: gsb_data_scheduled.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_scheduled.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- gsb_data_scheduled.c	6 Jun 2009 15:14:14 -0000	1.27
+++ gsb_data_scheduled.c	7 Jun 2009 22:18:31 -0000	1.28
@@ -33,7 +33,6 @@
 #include "gsb_data_scheduled.h"
 #include "./dialog.h"
 #include "./utils_dates.h"
-#include "./utils_str.h"
 #include "./include.h"
 #include "./gsb_real.h"
 /*END_INCLUDE*/

Index: gsb_data_bank.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_bank.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gsb_data_bank.c	6 Jun 2009 15:14:14 -0000	1.11
+++ gsb_data_bank.c	7 Jun 2009 22:18:31 -0000	1.12
@@ -31,7 +31,6 @@
 /*START_INCLUDE*/
 #include "gsb_data_bank.h"
 #include "./gsb_data_account.h"
-#include "./utils_str.h"
 /*END_INCLUDE*/
 
 

Index: gsb_data_payee.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_payee.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gsb_data_payee.h	27 Apr 2009 19:41:03 -0000	1.23
+++ gsb_data_payee.h	7 Jun 2009 22:18:31 -0000	1.24
@@ -3,7 +3,7 @@
 
 
 /* START_INCLUDE_H */
-#include "./gsb_real.h"
+#include "././gsb_real.h"
 /* END_INCLUDE_H */
 
 

Index: gsb_file_save.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_save.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- gsb_file_save.c	6 Jun 2009 15:14:14 -0000	1.128
+++ gsb_file_save.c	7 Jun 2009 22:18:31 -0000	1.129
@@ -59,6 +59,7 @@
 #include "./utils_str.h"
 #include "./structures.h"
 #include "./custom_list.h"
+#include "./utils_str.h"
 #include "./gsb_data_form.h"
 #include "./gsb_scheduler_list.h"
 #include "./include.h"

Index: gsb_data_report_text_comparison.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_report_text_comparison.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gsb_data_report_text_comparison.c	6 Jun 2009 15:14:14 -0000	1.14
+++ gsb_data_report_text_comparison.c	7 Jun 2009 22:18:31 -0000	1.15
@@ -33,7 +33,6 @@
 
 /*START_INCLUDE*/
 #include "gsb_data_report_text_comparison.h"
-#include "./utils_str.h"
 /*END_INCLUDE*/
 
 /** \struct

Index: gsb_data_account_cunit.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account_cunit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gsb_data_account_cunit.c	23 May 2009 19:25:10 -0000	1.2
+++ gsb_data_account_cunit.c	7 Jun 2009 22:18:31 -0000	1.3
@@ -35,6 +35,7 @@
 #include "./gsb_data_account.h"
 #include "./gsb_data_currency.h"
 #include "./gsb_data_transaction.h"
+#include "./gsb_data_account.h"
 #include "./gsb_real.h"
 /* END_INCLUDE */
 

Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- fenetre_principale.c	7 Jun 2009 21:38:10 -0000	1.114
+++ fenetre_principale.c	7 Jun 2009 22:18:31 -0000	1.115
@@ -45,6 +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 gboolean gsb_gui_on_account_switch_page ( GtkNotebook *notebook,
 					  GtkNotebookPage *page,
 					  guint page_number,

Index: affichage.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- affichage.h	1 Jan 2009 20:43:49 -0000	1.19
+++ affichage.h	7 Jun 2009 22:18:31 -0000	1.20
@@ -10,6 +10,6 @@
 GtkWidget * onglet_display_fonts ( void );
 GtkWidget *tab_display_toolbar ( void );
 gboolean update_homepage_title (GtkEntry *entry, gchar *value,
-				gint length, gint * position);
+                        gint length, gint * position);
 /* END_DECLARATION */
 #endif

Index: fenetre_principale.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- fenetre_principale.h	7 Jun 2009 21:38:10 -0000	1.25
+++ fenetre_principale.h	7 Jun 2009 22:18:31 -0000	1.26
@@ -22,12 +22,12 @@
 
 
 /* START_DECLARATION */
-gboolean gsb_gui_update_show_headings ();
 GtkWidget * create_main_widget ( void );
 void gsb_gui_headings_update ( gchar * title, gchar * suffix );
 void gsb_gui_headings_update_suffix ( gchar * suffix );
 void gsb_gui_notebook_change_page ( GsbGeneralNotebookPages page );
 void gsb_gui_sensitive_headings ( gboolean sensitive );
+gboolean gsb_gui_update_show_headings ();
 /*END_DECLARATION*/
 
 #endif

Index: affichage.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- affichage.c	7 Jun 2009 21:38:10 -0000	1.160
+++ affichage.c	7 Jun 2009 22:18:31 -0000	1.161
@@ -30,6 +30,7 @@
 #include "./gsb_data_account.h"
 #include "./gsb_file.h"
 #include "./navigation.h"
+#include "./fenetre_principale.h"
 #include "./barre_outils.h"
 #include "./gsb_scheduler_list.h"
 #include "./gsb_select_icon.h"
@@ -37,6 +38,7 @@
 #include "./traitement_variables.h"
 #include "./utils_str.h"
 #include "./utils.h"
+#include "./parametres.h"
 #include "./transaction_list.h"
 #include "./utils_font.h"
 #include "./structures.h"
@@ -46,31 +48,30 @@
 #include "./gsb_select_icon.h"
 #include "./include.h"
 #include "./erreur.h"
-#include "./fenetre_principale.h"
 /*END_INCLUDE*/
 
 /*START_STATIC*/
-gboolean preferences_switch_headings_bar ( GtkWidget *toggle_button,
-					   gpointer null );
 static gboolean change_choix_utilise_fonte_liste ( GtkWidget *check_button,
-					    GtkWidget *vbox );
+                        GtkWidget *vbox );
 static gboolean change_choix_utilise_logo ( GtkWidget *check_button,
-				     GtkWidget *hbox );
+                        GtkWidget *hbox );
 static gboolean change_grisbi_title_type ( GtkRadioButton *button, GtkWidget *entry );
 static void change_logo_accueil ( GtkWidget * file_selector );
 static gboolean change_toolbar_display_mode ( GtkRadioButton *button );
 static gboolean modification_logo_accueil ( );
+static gboolean preferences_switch_headings_bar ( GtkWidget *toggle_button,
+					   gpointer null );
 static  gboolean preferences_view_color_changed ( GtkWidget *color_button,
-						 GtkWidget *combobox );
+                        GtkWidget *combobox );
 static  gboolean preferences_view_color_combobox_changed ( GtkWidget *combobox,
-							  GtkWidget *color_button );
+                        GtkWidget *color_button );
 static  gboolean preferences_view_color_default ( GtkWidget *button,
-						 GtkWidget *combobox );
+                        GtkWidget *combobox );
 static  GtkWidget *preferences_view_create_color_combobox (void);
 static  gboolean preferences_view_update_preview_logo ( GtkFileChooser *file_chooser,
-						       GtkWidget *preview );
+                        GtkWidget *preview );
 static void update_fonte_listes ( gchar *fontname,
-			   gpointer null);
+                        gpointer null);
 /*END_STATIC*/
 
 

Index: transaction_list.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- transaction_list.h	21 May 2009 21:58:55 -0000	1.6
+++ transaction_list.h	7 Jun 2009 22:18:31 -0000	1.7
@@ -20,9 +20,9 @@
 void transaction_list_set_balances ( void );
 gboolean transaction_list_show_toggle_mark ( gboolean show );
 gboolean transaction_list_update_cell ( gint cell_col,
-                        gint cell_line );
+					gint cell_line );
 gboolean transaction_list_update_column ( gint column,
-                        GValue *value );
+					  GValue *value );
 gboolean transaction_list_update_element ( gint element_number );
 gboolean transaction_list_update_transaction ( gint transaction_number );
 /* END_DECLARATION */

Index: gsb_data_reconcile.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_reconcile.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gsb_data_reconcile.h	8 May 2009 17:21:15 -0000	1.10
+++ gsb_data_reconcile.h	7 Jun 2009 22:18:31 -0000	1.11
@@ -3,7 +3,7 @@
 
 
 /* START_INCLUDE_H */
-#include "./gsb_real.h"
+#include "././gsb_real.h"
 /* END_INCLUDE_H */
 
 /* START_DECLARATION */

Index: gsb_data_report.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_report.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- gsb_data_report.c	6 Jun 2009 15:14:14 -0000	1.30
+++ gsb_data_report.c	7 Jun 2009 22:18:31 -0000	1.31
@@ -35,7 +35,6 @@
 #include "./gsb_data_report_amout_comparison.h"
 #include "./gsb_data_report_text_comparison.h"
 #include "./utils_dates.h"
-#include "./utils_str.h"
 /*END_INCLUDE*/
 
 /** \struct

Index: transaction_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- transaction_list.c	7 Jun 2009 21:37:54 -0000	1.40
+++ transaction_list.c	7 Jun 2009 22:18:31 -0000	1.41
@@ -61,7 +61,7 @@
 /*START_STATIC*/
 static  void transaction_list_append_child ( gint transaction_number );
 static  CustomRecord *transaction_list_create_record ( gint transaction_number,
-						       gint line_in_transaction );
+						      gint line_in_transaction );
 static gint transaction_list_get_last_line ( gint nb_rows );
 static  gboolean transaction_list_update_white_child ( CustomRecord *white_record );
 /*END_STATIC*/
@@ -1057,11 +1057,20 @@
 	}
     }
 
-    if (record -> mother_row)
+    /* if the modification is on a child or a mother, update the white line */
+    if (record -> mother_row || record -> number_of_children)
     {
 	/* we need now to recalculate the amount of split and update the white line */
-	CustomRecord *mother_record = record -> mother_row;
-	CustomRecord *white_record = mother_record -> children_rows[mother_record -> number_of_children -1];
+	CustomRecord *mother_record;
+	CustomRecord *white_record;
+
+	/* get the mother if child */
+	if (record -> mother_row)
+	    mother_record = record -> mother_row;
+	else
+	    mother_record = record;
+	white_record = mother_record -> children_rows[mother_record -> number_of_children -1];
+
 	transaction_list_update_white_child (white_record);
     }
 

Index: gsb_data_account_cunit.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account_cunit.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gsb_data_account_cunit.h	23 May 2009 15:47:31 -0000	1.1
+++ gsb_data_account_cunit.h	7 Jun 2009 22:18:31 -0000	1.2
@@ -7,7 +7,7 @@
 /* END_INCLUDE_H */
 
 /* START_DECLARATION */
-CU_pSuite gsb_data_account_cunit_create_suite ( void );
+CU_pSuite gsb_data_account_cunit_create_suite();
 /* END_DECLARATION */
 
 #endif//_GSB_DATA_ACCOUNT_CUNIT_H



More information about the cvs mailing list