[grisbi-cvs] grisbi/src accueil.c, 1.196, 1.197 affichage.c, 1.155, 1.156 affichage_liste.c, 1.105, 1.106 balance_estimate_tab.c, 1.21, 1.22 barre_outils.c, 1.124, 1.125 categories_onglet.c, 1.192, 1.193 dialog.c, 1.70, 1.71 erreur.c, 1.91, 1.92 etats_affiche.c, 1.105, 1.106 etats_calculs.c, 1.131, 1.132 etats_config.c, 1.169, 1.170 etats_gtktable.c, 1.97, 1.98 etats_onglet.c, 1.133, 1.134 export.c, 1.25, 1.26 fenetre_principale.c, 1.110, 1.111 file_obfuscate.c, 1.10, 1.11 go-optionmenu.c, 1.10, 1.11 gsb_account.c, 1.43, 1.44 gsb_account_property.c, 1.34, 1.35 gsb_archive_config.c, 1.21, 1.22 gsb_assistant.c, 1.45, 1.46 gsb_assistant_archive_export.c, 1.16, 1.17 gsb_assistant_file.c, 1.17, 1.18 gsb_assistant_first.c, 1.23, 1.24 gsb_autofunc.c, 1.20, 1.21 gsb_bank.c, 1.20, 1.21 gsb_calendar_entry.c, 1.24, 1.25 gsb_crypt.c, 1.15, 1.16 gsb_currency.c, 1.39, 1.40 gsb_currency_config.c, 1.49, 1.50 gsb_data_account.c, 1.69, 1.70 gsb_data_archive_store.c, 1.13, 1.14 gsb_data_budget.c, 1.48, 1.49 gsb_data_category.c, 1.67, 1.68 gsb_data_currency_link.c, 1 .14, 1.15 gsb_data_payee.c, 1.46, 1.47 gsb_data_payee.h, 1.22, 1.23 gsb_data_reconcile.c, 1.16, 1.17 gsb_data_report_amout_comparison.c, 1.13, 1.14 gsb_data_scheduled.c, 1.25, 1.26 gsb_data_transaction.c, 1.59, 1.60 gsb_debug.c, 1.10, 1.11 gsb_file.c, 1.44, 1.45 gsb_file_config.c, 1.74, 1.75 gsb_file_load.c, 1.166, 1.167 gsb_file_load.h, 1.6, 1.7 gsb_file_save.c, 1.123, 1.124 gsb_file_util.c, 1.38, 1.39 gsb_form.c, 1.118, 1.119 gsb_form_config.c, 1.28, 1.29 gsb_payment_method_config.c, 1.33, 1.34 gsb_plugins.c, 1.19, 1.20 gsb_reconcile.c, 1.34, 1.35 gsb_reconcile_config.c, 1.26, 1.27 gsb_scheduler_list.c, 1.61, 1.62 gsb_select_icon.c, 1.12, 1.13 gsb_status.c, 1.18, 1.19 gsb_transactions_list.c, 1.158, 1.159 gtk_combofix.c, 1.60, 1.61 help.c, 1.85, 1.86 import.c, 1.274, 1.275 imputation_budgetaire.c, 1.155, 1.156 main.c, 1.140, 1.141 menu.c, 1.145, 1.146 meta_budgetary.c, 1.35, 1.36 meta_categories.c, 1.46, 1.47 meta_payee.c, 1.32, 1.33 metatree.c, 1.133, 1.134 metatree.h, 1.43, 1.44 navigation.c, 1.117, 1.118 parametres.c, 1.191, 1.192 print_conf ig.c, 1.44, 1.45 print_dialog_config.c, 1.7, 1.8 print_report.c, 1.9, 1.10 tiers_onglet.c, 1.158, 1.159 traitement_variables.c, 1.171, 1.172 transaction_list.c, 1.32, 1.33 utils.c, 1.51, 1.52 utils_buttons.c, 1.50, 1.51 utils_editables.c, 1.30, 1.31 utils_files.c, 1.39, 1.40 utils_operations.c, 1.31, 1.32

[Pierre Biava]

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

Modified Files:
	accueil.c affichage.c affichage_liste.c balance_estimate_tab.c 
	barre_outils.c categories_onglet.c dialog.c erreur.c 
	etats_affiche.c etats_calculs.c etats_config.c 
	etats_gtktable.c etats_onglet.c export.c fenetre_principale.c 
	file_obfuscate.c go-optionmenu.c gsb_account.c 
	gsb_account_property.c gsb_archive_config.c gsb_assistant.c 
	gsb_assistant_archive_export.c gsb_assistant_file.c 
	gsb_assistant_first.c gsb_autofunc.c gsb_bank.c 
	gsb_calendar_entry.c gsb_crypt.c gsb_currency.c 
	gsb_currency_config.c gsb_data_account.c 
	gsb_data_archive_store.c gsb_data_budget.c gsb_data_category.c 
	gsb_data_currency_link.c gsb_data_payee.c gsb_data_payee.h 
	gsb_data_reconcile.c gsb_data_report_amout_comparison.c 
	gsb_data_scheduled.c gsb_data_transaction.c gsb_debug.c 
	gsb_file.c gsb_file_config.c gsb_file_load.c gsb_file_load.h 
	gsb_file_save.c gsb_file_util.c gsb_form.c gsb_form_config.c 
	gsb_payment_method_config.c gsb_plugins.c gsb_reconcile.c 
	gsb_reconcile_config.c gsb_scheduler_list.c gsb_select_icon.c 
	gsb_status.c gsb_transactions_list.c gtk_combofix.c help.c 
	import.c imputation_budgetaire.c main.c menu.c 
	meta_budgetary.c meta_categories.c meta_payee.c metatree.c 
	metatree.h navigation.c parametres.c print_config.c 
	print_dialog_config.c print_report.c tiers_onglet.c 
	traitement_variables.c transaction_list.c utils.c 
	utils_buttons.c utils_editables.c utils_files.c 
	utils_operations.c 
Log Message:
use of the transaction instead of splitted transactions in the verification of reconciliations.
mk_include and minors changes

Index: gsb_form_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_config.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gsb_form_config.c	26 Apr 2009 17:39:34 -0000	1.28
+++ gsb_form_config.c	27 Apr 2009 19:41:03 -0000	1.29
@@ -82,7 +82,7 @@
 extern GtkWidget *form_transaction_part;
 extern gint max;
 extern gint saved_allocation_size;
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

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

Index: gsb_scheduler_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler_list.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- gsb_scheduler_list.c	26 Apr 2009 17:39:34 -0000	1.61
+++ gsb_scheduler_list.c	27 Apr 2009 19:41:03 -0000	1.62
@@ -94,12 +94,12 @@
 extern GdkColor couleur_fond[2];
 extern GdkColor couleur_grise;
 extern gint mise_a_jour_liste_echeances_manuelles_accueil;
-extern GtkWidget * navigation_tree_view ;
-extern GtkWidget *scheduler_button_delete ;
-extern GtkWidget *scheduler_button_edit ;
-extern GtkWidget *scheduler_button_execute ;
+extern GtkWidget * navigation_tree_view;
+extern GtkWidget *scheduler_button_delete;
+extern GtkWidget *scheduler_button_edit;
+extern GtkWidget *scheduler_button_execute;
 extern GdkColor split_background;
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_reconcile_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile_config.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gsb_reconcile_config.c	26 Apr 2009 17:39:34 -0000	1.26
+++ gsb_reconcile_config.c	27 Apr 2009 19:41:03 -0000	1.27
@@ -57,7 +57,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 /* the tree view used to modify the reconciles */

Index: etats_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_config.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- etats_config.c	26 Apr 2009 17:39:34 -0000	1.169
+++ etats_config.c	27 Apr 2009 19:41:03 -0000	1.170
@@ -365,11 +365,11 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget * navigation_tree_view ;
-extern GtkWidget *notebook_config_etat ;
-extern GtkWidget *notebook_etats ;
-extern GtkWidget *notebook_general ;
-extern GtkWidget *window ;
+extern GtkWidget * navigation_tree_view;
+extern GtkWidget *notebook_config_etat;
+extern GtkWidget *notebook_etats;
+extern GtkWidget *notebook_general;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: metatree.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- metatree.c	26 Apr 2009 17:39:35 -0000	1.133
+++ metatree.c	27 Apr 2009 19:41:03 -0000	1.134
@@ -118,7 +118,7 @@
 
 
 /*START_EXTERN*/
-extern GtkTreeModel * navigation_model ;
+extern GtkTreeModel * navigation_model;
 /*END_EXTERN*/
 
 

Index: gsb_file_save.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_save.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- gsb_file_save.c	26 Apr 2009 17:39:34 -0000	1.123
+++ gsb_file_save.c	27 Apr 2009 19:41:03 -0000	1.124
@@ -125,8 +125,8 @@
 
 
 /*START_EXTERN*/
-extern gchar *adresse_commune ;
-extern gchar *adresse_secondaire ;
+extern gchar *adresse_commune;
+extern gchar *adresse_secondaire;
 extern gint affichage_echeances;
 extern gint affichage_echeances_perso_nb_libre;
 extern GdkColor archive_background_color;
@@ -144,7 +144,7 @@
 extern GdkColor split_background;
 extern gint tab_affichage_ope[TRANSACTION_LIST_ROWS_NB][CUSTOM_MODEL_VISIBLE_COLUMNS];
 extern GdkColor text_color[2];
-extern gchar *titre_fichier ;
+extern gchar *titre_fichier;
 extern gint transaction_col_width[CUSTOM_MODEL_N_VISIBLES_COLUMN];
 extern gint valeur_echelle_recherche_date_import;
 /*END_EXTERN*/

Index: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- navigation.c	26 Apr 2009 17:39:35 -0000	1.117
+++ navigation.c	27 Apr 2009 19:41:03 -0000	1.118
@@ -101,12 +101,12 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *label_last_statement ;
-extern GtkWidget *label_titre_fichier ;
+extern GtkWidget *label_last_statement;
+extern GtkWidget *label_titre_fichier;
 extern GtkWidget *menu_import_rules;
 extern gint mise_a_jour_liste_comptes_accueil;
-extern GtkWidget *notebook_general ;
-extern gchar *titre_fichier ;
+extern GtkWidget *notebook_general;
+extern gchar *titre_fichier;
 /*END_EXTERN*/
 
 

Index: gsb_assistant_first.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_first.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gsb_assistant_first.c	26 Apr 2009 17:39:34 -0000	1.23
+++ gsb_assistant_first.c	27 Apr 2009 19:41:03 -0000	1.24
@@ -49,7 +49,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 enum first_assistant_page

Index: gsb_data_budget.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_budget.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- gsb_data_budget.c	26 Apr 2009 17:39:34 -0000	1.48
+++ gsb_data_budget.c	27 Apr 2009 19:41:03 -0000	1.49
@@ -102,7 +102,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 /** contains the g_slist of struct_budget */

Index: erreur.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/erreur.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- erreur.c	26 Apr 2009 17:39:34 -0000	1.91
+++ erreur.c	27 Apr 2009 19:41:03 -0000	1.92
@@ -51,7 +51,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gchar *nom_fichier_comptes ;
+extern gchar *nom_fichier_comptes;
 extern GtkUIManager * ui_manager;
 /*END_EXTERN*/
 

Index: gsb_assistant_file.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_file.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gsb_assistant_file.c	26 Apr 2009 17:39:34 -0000	1.17
+++ gsb_assistant_file.c	27 Apr 2009 19:41:03 -0000	1.18
@@ -64,10 +64,10 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gchar *adresse_commune ;
-extern gchar *nom_fichier_comptes ;
-extern gchar *titre_fichier ;
-extern GtkWidget *window ;
+extern gchar *adresse_commune;
+extern gchar *nom_fichier_comptes;
+extern gchar *titre_fichier;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 enum file_assistant_page

Index: dialog.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/dialog.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- dialog.c	26 Apr 2009 17:39:34 -0000	1.70
+++ dialog.c	27 Apr 2009 19:41:03 -0000	1.71
@@ -41,7 +41,7 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_crypt.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_crypt.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gsb_crypt.c	26 Apr 2009 17:39:34 -0000	1.15
+++ gsb_crypt.c	27 Apr 2009 19:41:03 -0000	1.16
@@ -36,7 +36,7 @@
 
 /*START_EXTERN*/
 extern gchar *crypt_key;
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 #ifndef NOSSL

Index: gsb_data_archive_store.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_archive_store.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gsb_data_archive_store.c	26 Apr 2009 17:39:34 -0000	1.13
+++ gsb_data_archive_store.c	27 Apr 2009 19:41:03 -0000	1.14
@@ -76,7 +76,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 /** contains the g_slist of struct_store_archive */

Index: etats_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_onglet.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- etats_onglet.c	26 Apr 2009 17:39:34 -0000	1.133
+++ etats_onglet.c	27 Apr 2009 19:41:03 -0000	1.134
@@ -82,11 +82,11 @@
 
 
 /*START_EXTERN*/
-extern struct struct_etat_affichage csv_affichage ;
-extern struct struct_etat_affichage html_affichage ;
-extern struct struct_etat_affichage latex_affichage ;
-extern GtkWidget *notebook_general ;
-extern GtkWidget *window ;
+extern struct struct_etat_affichage csv_affichage;
+extern struct struct_etat_affichage html_affichage;
+extern struct struct_etat_affichage latex_affichage;
+extern GtkWidget *notebook_general;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 /** Different formats supported.  */

Index: gsb_currency_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency_config.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- gsb_currency_config.c	26 Apr 2009 17:39:34 -0000	1.49
+++ gsb_currency_config.c	27 Apr 2009 19:41:03 -0000	1.50
@@ -74,11 +74,11 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *main_vbox ;
+extern GtkWidget *main_vbox;
 extern gint no_devise_totaux_categ;
 extern gint no_devise_totaux_ib;
 extern gint no_devise_totaux_tiers;
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 GtkWidget *combo_devise_totaux_tiers;

Index: tiers_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/tiers_onglet.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- tiers_onglet.c	26 Apr 2009 17:39:35 -0000	1.158
+++ tiers_onglet.c	27 Apr 2009 19:41:03 -0000	1.159
@@ -106,9 +106,9 @@
 gboolean sortie_edit_payee = FALSE;
 
 /*START_EXTERN*/
-extern GSList *liste_associations_tiers ;
-extern MetatreeInterface * payee_interface ;
-extern GtkWidget *window ;
+extern GSList *liste_associations_tiers;
+extern MetatreeInterface * payee_interface;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 enum payees_assistant_page

Index: menu.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/menu.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- menu.c	26 Apr 2009 17:39:35 -0000	1.145
+++ menu.c	27 Apr 2009 19:41:03 -0000	1.146
@@ -72,11 +72,11 @@
 
 
 /*START_EXTERN*/
-extern GtkTreeModel * navigation_model ;
-extern gsize nb_derniers_fichiers_ouverts ;
-extern gint nb_max_derniers_fichiers_ouverts ;
-extern gchar **tab_noms_derniers_fichiers_ouverts ;
-extern GtkWidget *window ;
+extern GtkTreeModel * navigation_model;
+extern gsize nb_derniers_fichiers_ouverts;
+extern gint nb_max_derniers_fichiers_ouverts;
+extern gchar **tab_noms_derniers_fichiers_ouverts;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: etats_gtktable.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_gtktable.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- etats_gtktable.c	26 Apr 2009 17:39:34 -0000	1.97
+++ etats_gtktable.c	27 Apr 2009 19:41:03 -0000	1.98
@@ -71,7 +71,7 @@
 
 /*START_EXTERN*/
 extern gint nb_colonnes;
-extern GtkWidget *scrolled_window_etat ;
+extern GtkWidget *scrolled_window_etat;
 /*END_EXTERN*/
 
 

Index: gsb_data_report_amout_comparison.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_report_amout_comparison.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gsb_data_report_amout_comparison.c	26 Apr 2009 17:39:34 -0000	1.13
+++ gsb_data_report_amout_comparison.c	27 Apr 2009 19:41:03 -0000	1.14
@@ -73,7 +73,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: gsb_data_transaction.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_transaction.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- gsb_data_transaction.c	26 Apr 2009 17:39:34 -0000	1.59
+++ gsb_data_transaction.c	27 Apr 2009 19:41:03 -0000	1.60
@@ -105,7 +105,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: gsb_account_property.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account_property.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gsb_account_property.c	26 Apr 2009 17:39:34 -0000	1.34
+++ gsb_account_property.c	27 Apr 2009 19:41:03 -0000	1.35
@@ -172,7 +172,7 @@
 extern gint mise_a_jour_liste_comptes_accueil;
 extern gint mise_a_jour_liste_echeances_manuelles_accueil;
 extern gint mise_a_jour_soldes_minimaux;
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: print_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/print_config.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- print_config.c	26 Apr 2009 17:39:35 -0000	1.44
+++ print_config.c	27 Apr 2009 19:41:03 -0000	1.45
@@ -58,7 +58,7 @@
 };
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_calendar_entry.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_calendar_entry.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gsb_calendar_entry.c	26 Apr 2009 17:39:34 -0000	1.24
+++ gsb_calendar_entry.c	27 Apr 2009 19:41:03 -0000	1.25
@@ -64,7 +64,7 @@
 
 /*START_EXTERN*/
 extern GdkColor calendar_entry_color;
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 #define ENTRY_NORMAL 0

Index: traitement_variables.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/traitement_variables.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- traitement_variables.c	26 Apr 2009 17:39:35 -0000	1.171
+++ traitement_variables.c	27 Apr 2009 19:41:03 -0000	1.172
@@ -138,27 +138,27 @@
 /*START_EXTERN*/
 extern gint affichage_echeances;
 extern gint affichage_echeances_perso_nb_libre;
-extern GtkTreeModel *bank_list_model ;
-extern gint current_tree_view_width ;
+extern GtkTreeModel *bank_list_model;
+extern gint current_tree_view_width;
 extern gint display_one_line;
 extern gint display_three_lines;
 extern gint display_two_lines;
-extern gint id_timeout ;
+extern gint id_timeout;
 extern gint mise_a_jour_fin_comptes_passifs;
 extern gint mise_a_jour_liste_comptes_accueil;
 extern gint mise_a_jour_liste_echeances_auto_accueil;
 extern gint mise_a_jour_liste_echeances_manuelles_accueil;
 extern gint mise_a_jour_soldes_minimaux;
-extern GtkWidget * navigation_tree_view ;
+extern GtkWidget * navigation_tree_view;
 extern gint no_devise_totaux_categ;
 extern gint no_devise_totaux_ib;
 extern gint no_devise_totaux_tiers;
-extern GtkWidget *notebook_general ;
-extern GSList *orphan_child_transactions ;
+extern GtkWidget *notebook_general;
+extern GSList *orphan_child_transactions;
 extern gint scheduler_col_width[SCHEDULER_COL_VISIBLE_COLUMNS];
-extern gint scheduler_current_tree_view_width ;
-extern GtkWidget *solde_label ;
-extern GtkWidget *solde_label_pointe ;
+extern gint scheduler_current_tree_view_width;
+extern GtkWidget *solde_label;
+extern GtkWidget *solde_label_pointe;
 extern gint tab_affichage_ope[TRANSACTION_LIST_ROWS_NB][CUSTOM_MODEL_VISIBLE_COLUMNS];
 extern gint transaction_col_width[CUSTOM_MODEL_N_VISIBLES_COLUMN];
 extern gint valeur_echelle_recherche_date_import;

Index: utils_editables.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_editables.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- utils_editables.c	26 Apr 2009 17:39:35 -0000	1.30
+++ utils_editables.c	27 Apr 2009 19:41:03 -0000	1.31
@@ -34,7 +34,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: barre_outils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/barre_outils.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- barre_outils.c	26 Apr 2009 17:39:34 -0000	1.124
+++ barre_outils.c	27 Apr 2009 19:41:03 -0000	1.125
@@ -76,7 +76,7 @@
 
 /*START_EXTERN*/
 extern GtkWidget *barre_outils;
-extern gboolean block_menu_cb ;
+extern gboolean block_menu_cb;
 extern GtkUIManager * ui_manager;
 /*END_EXTERN*/
 

Index: imputation_budgetaire.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/imputation_budgetaire.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- imputation_budgetaire.c	26 Apr 2009 17:39:35 -0000	1.155
+++ imputation_budgetaire.c	27 Apr 2009 19:41:03 -0000	1.156
@@ -75,8 +75,8 @@
 gboolean sortie_edit_budgetary_line = FALSE;
 
 /*START_EXTERN*/
-extern MetatreeInterface * budgetary_interface ;
-extern GtkWidget *window ;
+extern MetatreeInterface * budgetary_interface;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: meta_budgetary.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/meta_budgetary.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- meta_budgetary.c	26 Apr 2009 17:39:35 -0000	1.35
+++ meta_budgetary.c	27 Apr 2009 19:41:03 -0000	1.36
@@ -51,7 +51,7 @@
 
 /*START_EXTERN*/
 extern gint no_devise_totaux_ib;
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: gsb_data_category.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_category.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- gsb_data_category.c	26 Apr 2009 17:39:34 -0000	1.67
+++ gsb_data_category.c	27 Apr 2009 19:41:03 -0000	1.68
@@ -102,7 +102,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

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

Index: utils_operations.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_operations.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- utils_operations.c	26 Apr 2009 17:39:35 -0000	1.31
+++ utils_operations.c	27 Apr 2009 19:41:03 -0000	1.32
@@ -45,15 +45,15 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *arbre_categ ;
-extern MetatreeInterface * budgetary_interface ;
-extern GtkWidget *budgetary_line_tree ;
-extern GtkTreeStore *budgetary_line_tree_model ;
-extern GtkTreeStore * categ_tree_model ;
-extern MetatreeInterface * category_interface ;
-extern MetatreeInterface * payee_interface ;
-extern GtkWidget *payee_tree ;
-extern GtkTreeStore *payee_tree_model ;
+extern GtkWidget *arbre_categ;
+extern MetatreeInterface * budgetary_interface;
+extern GtkWidget *budgetary_line_tree;
+extern GtkTreeStore *budgetary_line_tree_model;
+extern GtkTreeStore * categ_tree_model;
+extern MetatreeInterface * category_interface;
+extern MetatreeInterface * payee_interface;
+extern GtkWidget *payee_tree;
+extern GtkTreeStore *payee_tree_model;
 /*END_EXTERN*/
 
 

Index: gsb_status.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_status.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gsb_status.c	26 Apr 2009 17:39:34 -0000	1.18
+++ gsb_status.c	27 Apr 2009 19:41:03 -0000	1.19
@@ -38,7 +38,7 @@
 
 /*START_EXTERN*/
 extern gint max;
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 /** Status bar displayed in the bottom of Grisbi window.  */

Index: gsb_assistant_archive_export.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_archive_export.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gsb_assistant_archive_export.c	26 Apr 2009 17:39:34 -0000	1.16
+++ gsb_assistant_archive_export.c	27 Apr 2009 19:41:03 -0000	1.17
@@ -86,7 +86,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_data_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- gsb_data_account.c	26 Apr 2009 17:39:34 -0000	1.69
+++ gsb_data_account.c	27 Apr 2009 19:41:03 -0000	1.70
@@ -123,7 +123,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 extern gint tab_affichage_ope[TRANSACTION_LIST_ROWS_NB][CUSTOM_MODEL_VISIBLE_COLUMNS];
 /*END_EXTERN*/
 
@@ -2564,6 +2564,14 @@
 }
 
 
+/**
+ * get the default pixbuf icon for the kind_account
+ * 
+ * \param kind_account
+ * 
+ * \return pixbuf icon 
+ * */
+
 GdkPixbuf *gsb_data_account_get_account_standard_pixbuf ( kind_account account_kind )
 {
     GdkPixbuf * pixbuf = NULL;
@@ -2594,7 +2602,6 @@
         g_object_set_data ( G_OBJECT ( pixbuf ), "name_icon",  
                                g_build_filename (PIXMAPS_DIR,
                                account_icon, NULL) );
-
     else
         devel_debug ( error -> message );
 
@@ -2602,6 +2609,12 @@
 }
 
 
+/**
+ *
+ *
+ *
+ *
+ * */
 void gsb_data_account_change_account_icon ( GtkWidget *button, gpointer data )
 {
     GdkPixbuf * pixbuf;
@@ -2617,9 +2630,8 @@
         name_icon = g_object_get_data ( G_OBJECT ( pixbuf ), "name_icon" );
     else
         name_icon = g_build_filename (PIXMAPS_DIR, "ac_bank.png", NULL);
-    devel_debug (name_icon);
+
     new_icon = gsb_select_icon_create_window ( name_icon );
-    devel_debug (new_icon);
     if ( new_icon )
     {
         current_account = gsb_gui_navigation_get_current_account ();
@@ -2631,6 +2643,12 @@
 }
 
 
+/**
+ *
+ *
+ *
+ *
+ * */
 gchar *gsb_data_account_get_owner (gint account_number)
 {
     struct_account *account;

Index: balance_estimate_tab.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_tab.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- balance_estimate_tab.c	26 Apr 2009 17:39:34 -0000	1.21
+++ balance_estimate_tab.c	27 Apr 2009 19:41:03 -0000	1.22
@@ -60,8 +60,8 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
-extern GtkWidget *window ;
+extern gsb_real null_real;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: print_dialog_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/print_dialog_config.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- print_dialog_config.c	26 Apr 2009 17:39:35 -0000	1.7
+++ print_dialog_config.c	27 Apr 2009 19:41:03 -0000	1.8
@@ -35,7 +35,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 #if GTK_CHECK_VERSION(2,10,0)

Index: utils_buttons.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_buttons.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- utils_buttons.c	26 Apr 2009 17:39:35 -0000	1.50
+++ utils_buttons.c	27 Apr 2009 19:41:03 -0000	1.51
@@ -33,7 +33,7 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: meta_categories.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/meta_categories.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- meta_categories.c	26 Apr 2009 17:39:35 -0000	1.46
+++ meta_categories.c	27 Apr 2009 19:41:03 -0000	1.47
@@ -54,7 +54,7 @@
 
 /*START_EXTERN*/
 extern gint no_devise_totaux_categ;
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 static MetatreeInterface _category_interface = {

Index: gsb_data_payee.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_payee.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- gsb_data_payee.c	26 Apr 2009 17:39:34 -0000	1.46
+++ gsb_data_payee.c	27 Apr 2009 19:41:03 -0000	1.47
@@ -70,7 +70,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 /** contains the g_slist of struct_payee */

Index: file_obfuscate.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/file_obfuscate.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- file_obfuscate.c	26 Apr 2009 17:39:34 -0000	1.10
+++ file_obfuscate.c	27 Apr 2009 19:41:03 -0000	1.11
@@ -55,8 +55,8 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gchar *nom_fichier_comptes ;
-extern gsb_real null_real ;
+extern gchar *nom_fichier_comptes;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: gsb_file_util.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_util.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- gsb_file_util.c	26 Apr 2009 17:39:34 -0000	1.38
+++ gsb_file_util.c	27 Apr 2009 19:41:03 -0000	1.39
@@ -40,7 +40,7 @@
 
 
 /*START_EXTERN*/
-extern gchar *nom_fichier_comptes ;
+extern gchar *nom_fichier_comptes;
 /*END_EXTERN*/
 
 

Index: meta_payee.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/meta_payee.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- meta_payee.c	26 Apr 2009 17:39:35 -0000	1.32
+++ meta_payee.c	27 Apr 2009 19:41:03 -0000	1.33
@@ -65,7 +65,7 @@
 
 /*START_EXTERN*/
 extern gint no_devise_totaux_tiers;
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: gsb_payment_method_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_payment_method_config.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gsb_payment_method_config.c	26 Apr 2009 17:39:34 -0000	1.33
+++ gsb_payment_method_config.c	27 Apr 2009 19:41:03 -0000	1.34
@@ -80,7 +80,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *fenetre_preferences ;
+extern GtkWidget *fenetre_preferences;
 /*END_EXTERN*/
 
 static GtkWidget *payment_method_treeview;

Index: etats_affiche.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_affiche.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- etats_affiche.c	26 Apr 2009 17:39:34 -0000	1.105
+++ etats_affiche.c	27 Apr 2009 19:41:03 -0000	1.106
@@ -104,7 +104,7 @@
 extern const gchar *nom_ss_categ_en_cours;
 extern const gchar *nom_ss_ib_en_cours;
 extern const gchar *nom_tiers_en_cours;
-extern gsb_real null_real ;
+extern gsb_real null_real;
 extern gint titres_affiches;
 /*END_EXTERN*/
 

Index: etats_calculs.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_calculs.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- etats_calculs.c	26 Apr 2009 17:39:34 -0000	1.131
+++ etats_calculs.c	27 Apr 2009 19:41:03 -0000	1.132
@@ -102,9 +102,9 @@
 extern gint devise_ib_etat;
 extern gint devise_tiers_etat;
 extern gint exo_en_cours_etat;
-extern struct struct_etat_affichage gtktable_affichage ;
 extern struct struct_etat_affichage gtktable_affichage;
-extern struct struct_etat_affichage latex_affichage ;
+extern struct struct_etat_affichage gtktable_affichage;
+extern struct struct_etat_affichage latex_affichage;
 extern gint ligne_debut_partie;
 extern gsb_real montant_categ_etat;
 extern gsb_real montant_compte_etat;
@@ -131,8 +131,8 @@
 extern const gchar *nom_ss_categ_en_cours;
 extern const gchar *nom_ss_ib_en_cours;
 extern const gchar *nom_tiers_en_cours;
-extern GtkWidget *notebook_general ;
-extern gsb_real null_real ;
+extern GtkWidget *notebook_general;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: gsb_select_icon.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_select_icon.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gsb_select_icon.c	26 Apr 2009 17:39:34 -0000	1.12
+++ gsb_select_icon.c	27 Apr 2009 19:41:03 -0000	1.13
@@ -48,7 +48,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 static GtkWidget * dialog;

Index: affichage.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- affichage.c	26 Apr 2009 17:39:34 -0000	1.155
+++ affichage.c	27 Apr 2009 19:41:03 -0000	1.156
@@ -72,8 +72,8 @@
 
 
 /*START_EXTERN*/
-extern gchar *adresse_commune ;
-extern gchar *adresse_secondaire ;
+extern gchar *adresse_commune;
+extern gchar *adresse_secondaire;
 extern GdkColor archive_background_color;
 extern GdkColor calendar_entry_color;
 extern GdkColor couleur_fond[2];
@@ -86,15 +86,15 @@
 extern GdkColor default_couleur_selection;
 extern GdkColor default_split_background;
 extern GdkColor default_text_color[2];
-extern GtkWidget *fenetre_preferences ;
-extern GtkWidget *hbox_title ;
-extern GtkWidget *label_titre_fichier ;
-extern GtkWidget *logo_accueil ;
-extern gchar *nom_fichier_comptes ;
+extern GtkWidget *fenetre_preferences;
+extern GtkWidget *hbox_title;
+extern GtkWidget *label_titre_fichier;
+extern GtkWidget *logo_accueil;
+extern gchar *nom_fichier_comptes;
 extern GdkColor split_background;
 extern GdkColor text_color[2];
-extern gchar *titre_fichier ;
-extern GtkWidget *window ;
+extern gchar *titre_fichier;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_archive_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_archive_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gsb_archive_config.c	26 Apr 2009 17:39:34 -0000	1.21
+++ gsb_archive_config.c	27 Apr 2009 19:41:03 -0000	1.22
@@ -79,7 +79,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 /**

Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- import.c	26 Apr 2009 17:39:34 -0000	1.274
+++ import.c	27 Apr 2009 19:41:03 -0000	1.275
@@ -143,7 +143,7 @@
 extern GtkWidget *menu_import_rules;
 extern gint mise_a_jour_liste_comptes_accueil;
 extern gint mise_a_jour_soldes_minimaux;
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 /* recopie des types de transaction de la libofx en attendant une version propre */

Index: export.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/export.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- export.c	26 Apr 2009 17:39:34 -0000	1.25
+++ export.c	27 Apr 2009 19:41:03 -0000	1.26
@@ -51,7 +51,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gchar *titre_fichier ;
+extern gchar *titre_fichier;
 /*END_EXTERN*/
 
 

Index: gsb_file_load.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_load.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- gsb_file_load.c	26 Apr 2009 17:39:34 -0000	1.166
+++ gsb_file_load.c	27 Apr 2009 19:41:03 -0000	1.167
@@ -2,6 +2,7 @@
 /*                                                                            */
 /*     Copyright (C)	2000-2008 Cédric Auger (cedric at grisbi.org)	          */
 /*			2003-2009 Benjamin Drieu (bdrieu at april.org)             	      */
+/*                      2009 Pierre Biava (pierre at pierre.biava.name)          */
 /* 			http://www.grisbi.org			                        	      */
 /*                                                                            */
 /*  This program is free software; you can redistribute it and/or modify      */
@@ -21,7 +22,6 @@
 /* ************************************************************************** */
 
 
-
 #include "include.h"
 #include <glib/gstdio.h>
 #include <gio/gio.h>
@@ -74,48 +74,6 @@
 #include "./gsb_data_report.h"
 /*END_INCLUDE*/
 
-static struct
-{
-    gboolean download_ok;
-    gchar *file_version;
-    gchar *grisbi_version;
-
-    /* there is always only one to TRUE, used to split the retrieves functions */
-
-    gboolean general_part;
-    gboolean account_part;
-    gboolean report_part;
-} download_tmp_values = { FALSE, NULL, NULL, FALSE, FALSE, FALSE};
-
-static gint account_number;
-
-/* to import older file than 0.6, makes the link between category and sub-category */
-static gint last_category = 0;
-static gint last_sub_category_number = 0;
-
-/* to import older file than 0.6, makes the link between budget and sub-budget */
-static gint last_budget = 0;
-static gint last_sub_budget_number = 0;
-
-/* to import older file than 0.6, makes the link between report and comparison structures */
-static gint last_report_number;
-
-/** filled only when loading a version before 0.6, contains the order of the accounts
- * in the 0.6, the accounts are saved directly in the good order
- * this is a list of the accounts number, in the good order */
-static GSList *sort_accounts = NULL;
-
-/* temporary structure used to go from the 0.5.x versions to 0.6.x versions
- * because before, method of payment were saved in each account, and now
- * there is a general list of method of payment */
-struct payment_conversion_struct
-{
-    gint account_number;
-    gint last_payment_number;
-    gint new_payment_number;
-};
-static GSList *payment_conversion_list = NULL;
-
 /** temporary structure to set the final date and the final balance of a reconcile
  * in the reconcile itself, and not in the account as before 0.6.0 */
 struct reconcile_conversion_struct
@@ -126,93 +84,78 @@
     gsb_real final_balance;
 };
 
-struct old_new_rec_conversion_struct
-{
-    gint account_number;
-    gint old_rec_number;
-    gint new_rec_number;
-};
-static GSList *reconcile_print_list = NULL;
-static GSList *old_new_rec_list = NULL;
-static GSList *reconcile_conversion_list = NULL;
-static struct reconcile_conversion_struct *buffer_reconcile_conversion;
-static struct old_new_rec_conversion_struct *buffer_old_new_rec_conversion;
-
-static gint cmp_int (struct reconcile_conversion_struct *reconcile_1,
-                    struct reconcile_conversion_struct *reconcile_2);
-
 /*START_STATIC*/
 static gint cmp_int (struct reconcile_conversion_struct *reconcile_1,
-                    struct reconcile_conversion_struct *reconcile_2);
+                        struct reconcile_conversion_struct *reconcile_2);
 static void gsb_file_load_account_part ( const gchar **attribute_names,
-				  const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_account_part_before_0_6 ( GMarkupParseContext *context,
-					     const gchar *text );
+                        const gchar *text );
 static void gsb_file_load_archive ( const gchar **attribute_names,
-			     const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_bank ( const gchar **attribute_names,
-			  const gchar **attribute_values );
+                        const gchar **attribute_values );
 static gboolean gsb_file_load_check_new_structure ( gchar *file_content );
 static void gsb_file_load_color_part ( const gchar **attribute_names,
-				const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_currency ( const gchar **attribute_names,
-			      const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_currency_link ( const gchar **attribute_names,
-				   const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_end_element_before_0_6 ( GMarkupParseContext *context,
 					    const gchar *element_name,
 					    gpointer user_data,
 					    GError **error);
 static void gsb_file_load_financial_year ( const gchar **attribute_names,
-				    const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_general_part ( const gchar **attribute_names,
-				  const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_general_part_before_0_6 ( GMarkupParseContext *context,
-					     const gchar *text );
+					    const gchar *text );
 static gint gsb_file_load_get_new_payment_number ( gint account_number,
 					    gint payment_number );
 static void gsb_file_load_import_rule ( const gchar **attribute_names,
-				 const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_logo_accueil ( const gchar **attribute_names,
 				       const gchar **attribute_values );
 static void gsb_file_load_party ( const gchar **attribute_names,
-			   const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_payment_part ( const gchar **attribute_names,
-				  const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_print_part ( const gchar **attribute_names,
-				const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_reconcile ( const gchar **attribute_names,
-			       const gchar **attribute_values );
+                        const gchar **attribute_values );
 static void gsb_file_load_report_part_before_0_6 ( GMarkupParseContext *context,
 					    const gchar *text );
 static void gsb_file_load_scheduled_transactions ( const gchar **attribute_names,
 					    const gchar **attribute_values );
 static void gsb_file_load_start_element ( GMarkupParseContext *context,
-				   const gchar *element_name,
-				   const gchar **attribute_names,
-				   const gchar **attribute_values,
-				   gpointer user_data,
-				   GError **error);
+                        const gchar *element_name,
+                        const gchar **attribute_names,
+                        const gchar **attribute_values,
+                        gpointer user_data,
+                        GError **error);
 static void gsb_file_load_start_element_before_0_6 ( GMarkupParseContext *context,
-					      const gchar *element_name,
-					      const gchar **attribute_names,
-					      const gchar **attribute_values,
-					      gpointer user_data,
-					      GError **error);
+                        const gchar *element_name,
+					    const gchar **attribute_names,
+					    const gchar **attribute_values,
+					    gpointer user_data,
+					    GError **error);
 static void gsb_file_load_text_element_before_0_6 ( GMarkupParseContext *context,
-					     const gchar *text,
-					     gsize text_len,  
-					     gpointer user_data,
-					     GError **error);
+					    const gchar *text,
+					    gsize text_len,  
+					    gpointer user_data,
+					    GError **error);
 static void gsb_file_load_transactions ( const gchar **attribute_names,
-				  const gchar **attribute_values );
+                        const gchar **attribute_values );
 static gboolean gsb_file_load_update_previous_version ( void );
 /*END_STATIC*/
 
 
 /*START_EXTERN*/
-extern gchar *adresse_commune ;
-extern gchar *adresse_secondaire ;
+extern gchar *adresse_commune;
+extern gchar *adresse_secondaire;
 extern gint affichage_echeances;
 extern gint affichage_echeances_perso_nb_libre;
 extern GdkColor archive_background_color;
@@ -223,23 +166,90 @@
 extern gint display_one_line;
 extern gint display_three_lines;
 extern gint display_two_lines;
-extern struct iso_4217_currency iso_4217_currencies[] ;
-extern GtkWidget *logo_accueil ;
+extern struct iso_4217_currency iso_4217_currencies[];
+extern GtkWidget *logo_accueil;
 extern gint no_devise_totaux_categ;
 extern gint no_devise_totaux_ib;
 extern gint no_devise_totaux_tiers;
-extern gsb_real null_real ;
+extern gsb_real null_real;
 extern gint scheduler_col_width[SCHEDULER_COL_VISIBLE_COLUMNS];
 extern GdkColor split_background;
 extern gint tab_affichage_ope[TRANSACTION_LIST_ROWS_NB][CUSTOM_MODEL_VISIBLE_COLUMNS];
 extern GdkColor text_color[2];
-extern gchar *titre_fichier ;
+extern gchar *titre_fichier;
 extern gint transaction_col_width[CUSTOM_MODEL_N_VISIBLES_COLUMN];
 extern gint valeur_echelle_recherche_date_import;
 /*END_EXTERN*/
 
+static struct
+{
+    gboolean download_ok;
+    gchar *file_version;
+    gchar *grisbi_version;
+
+    /* there is always only one to TRUE, used to split the retrieves functions */
+
+    gboolean general_part;
+    gboolean account_part;
+    gboolean report_part;
+} download_tmp_values = { FALSE, NULL, NULL, FALSE, FALSE, FALSE};
+
+static gint account_number;
+
+/* to import older file than 0.6, makes the link between category and sub-category */
+static gint last_category = 0;
+static gint last_sub_category_number = 0;
+
+/* to import older file than 0.6, makes the link between budget and sub-budget */
+static gint last_budget = 0;
+static gint last_sub_budget_number = 0;
+
+/* to import older file than 0.6, makes the link between report and comparison structures */
+static gint last_report_number;
+
+/** filled only when loading a version before 0.6, contains the order of the accounts
+ * in the 0.6, the accounts are saved directly in the good order
+ * this is a list of the accounts number, in the good order */
+static GSList *sort_accounts = NULL;
+
+/* temporary structure used to go from the 0.5.x versions to 0.6.x versions
+ * because before, method of payment were saved in each account, and now
+ * there is a general list of method of payment */
+struct payment_conversion_struct
+{
+    gint account_number;
+    gint last_payment_number;
+    gint new_payment_number;
+};
+static GSList *payment_conversion_list = NULL;
+
+/** temporary structure to set the final date and the final balance of a reconcile
+ * in the reconcile itself, and not in the account as before 0.6.0 */
+//~ struct reconcile_conversion_struct
+//~ {
+    //~ gint reconcile_number;
+    //~ gint account_number;
+    //~ GDate *final_date;
+    //~ gsb_real final_balance;
+//~ };
 
+static GSList *reconcile_conversion_list = NULL;
+static struct reconcile_conversion_struct *buffer_reconcile_conversion;
 
+/* structure temporaire utilisée pour faire un lien entre ancien et nouveau numéro
+ * de rapprochement et chaque compte parce que dans les versions précédentes de Grisbi
+ * on pouvait utiliser un même rapprochement dans les opérations car celles-ci étaient 
+ * organisées par comptes */
+struct old_new_rec_conversion_struct
+{
+    gint account_number;
+    gint old_rec_number;
+    gint new_rec_number;
+};
+static GSList *old_new_rec_list = NULL;
+static struct old_new_rec_conversion_struct *buffer_old_new_rec_conversion;
+
+static GSList *reconcile_print_list = NULL;
 
 /**
  * called to open the grisbi file given in param
@@ -405,11 +415,11 @@
 
 
 void gsb_file_load_start_element ( GMarkupParseContext *context,
-				   const gchar *element_name,
-				   const gchar **attribute_names,
-				   const gchar **attribute_values,
-				   gpointer user_data,
-				   GError **error)
+                        const gchar *element_name,
+                        const gchar **attribute_names,
+                        const gchar **attribute_values,
+                        gpointer user_data,
+                        GError **error)
 {
     /* the first time we come here, we check if it's a grisbi file */
     if ( !download_tmp_values.download_ok )
@@ -616,8 +626,8 @@
 
 
 void gsb_file_load_error ( GMarkupParseContext *context,
-			   GError *error,
-			   gpointer user_data )
+                        GError *error,
+                        gpointer user_data )
 {
     /* the first time we come here, we check if it's a grisbi file */
     gchar* tmpstr = g_strdup_printf (
@@ -638,7 +648,7 @@
  *
  * */
 void gsb_file_load_general_part ( const gchar **attribute_names,
-				  const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
 
@@ -959,7 +969,7 @@
  *
  * */
 void gsb_file_load_color_part ( const gchar **attribute_names,
-				const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
 
@@ -1153,7 +1163,7 @@
  *
  * */
 void gsb_file_load_print_part ( const gchar **attribute_names,
-				const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
 
@@ -1260,7 +1270,7 @@
  *
  * */
 void gsb_file_load_account_part ( const gchar **attribute_names,
-				  const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint account_number = 0;
@@ -1639,7 +1649,7 @@
  *
  * */
 void gsb_file_load_payment_part ( const gchar **attribute_names,
-				  const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint payment_number;
@@ -1739,7 +1749,7 @@
  *
  * */
 void gsb_file_load_transactions ( const gchar **attribute_names,
-				  const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint transaction_number = 0;
@@ -2300,7 +2310,7 @@
  *
  * */
 void gsb_file_load_party ( const gchar **attribute_names,
-			   const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint payee_number;
@@ -2378,7 +2388,7 @@
  *
  * */
 void gsb_file_load_category ( const gchar **attribute_names,
-			      const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint category_number = 0;
@@ -2440,7 +2450,7 @@
  *
  * */
 void gsb_file_load_sub_category ( const gchar **attribute_names,
-				  const gchar **attribute_values)
+                        const gchar **attribute_values)
 {
     gint i=0;
     gint category_number = 0;
@@ -2503,7 +2513,7 @@
  *
  * */
 void gsb_file_load_budgetary ( const gchar **attribute_names,
-			       const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint budget_number = 0;
@@ -2565,7 +2575,7 @@
  *
  * */
 void gsb_file_load_sub_budgetary ( const gchar **attribute_names,
-				   const gchar **attribute_values)
+                        const gchar **attribute_values)
 {
     gint i=0;
     gint budget_number = 0;
@@ -2628,7 +2638,7 @@
  *
  * */
 void gsb_file_load_currency ( const gchar **attribute_names,
-			      const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint currency_number;
@@ -2725,7 +2735,7 @@
  *
  * */
 void gsb_file_load_currency_link ( const gchar **attribute_names,
-				   const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint link_number;
@@ -2796,7 +2806,7 @@
  *
  * */
 void gsb_file_load_bank ( const gchar **attribute_names,
-			  const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint bank_number = 0;
@@ -2949,7 +2959,7 @@
  *
  * */
 void gsb_file_load_financial_year ( const gchar **attribute_names,
-				    const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint fyear_number;
@@ -3043,7 +3053,7 @@
  *
  * */
 void gsb_file_load_archive ( const gchar **attribute_names,
-			     const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint archive_number;
@@ -3140,7 +3150,7 @@
  *
  * */
 void gsb_file_load_reconcile ( const gchar **attribute_names,
-			       const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint reconcile_number = 0;
@@ -3238,7 +3248,7 @@
  *
  * */
 void gsb_file_load_import_rule ( const gchar **attribute_names,
-				 const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint import_rule_number = 0;
@@ -3345,7 +3355,7 @@
  *
  * */
 void gsb_file_load_report ( const gchar **attribute_names,
-			    const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint report_number = 0;
@@ -4082,7 +4092,7 @@
  *
  * */
 void gsb_file_load_text_comparison ( const gchar **attribute_names,
-				     const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint text_comparison_number = 0;
     gint i=0;
@@ -4245,7 +4255,7 @@
  *
  * */
 void gsb_file_load_amount_comparison ( const gchar **attribute_names,
-				       const gchar **attribute_values )
+                        const gchar **attribute_values )
 {
     gint i=0;
     gint amount_comparison_number = 0;
@@ -4403,11 +4413,11 @@
     while ( attribute_names[i] );
 }
 void gsb_file_load_start_element_before_0_6 ( GMarkupParseContext *context,
-					      const gchar *element_name,
-					      const gchar **attribute_names,
-					      const gchar **attribute_values,
-					      gpointer user_data,
-					      GError **error)
+                        const gchar *element_name,
+					    const gchar **attribute_names,
+					    const gchar **attribute_values,
+					    gpointer user_data,
+					    GError **error)
 {
     /* the first time we come here, we check if it's a grisbi file */
     gchar **pointeur_char;
@@ -5562,10 +5572,10 @@
 }
 
 void gsb_file_load_text_element_before_0_6 ( GMarkupParseContext *context,
-					     const gchar *text,
-					     gsize text_len,  
-					     gpointer user_data,
-					     GError **error)
+					    const gchar *text,
+					    gsize text_len,  
+					    gpointer user_data,
+					    GError **error)
 {
     /* we come here for all text element, we split here to go
      * on the necessary function to work with that element */
@@ -5582,7 +5592,7 @@
 }
 
 void gsb_file_load_general_part_before_0_6 ( GMarkupParseContext *context,
-					     const gchar *text )
+					    const gchar *text )
 {
     const gchar *element_name;
 
@@ -5775,7 +5785,7 @@
 
 
 void gsb_file_load_account_part_before_0_6 ( GMarkupParseContext *context,
-					     const gchar *text )
+                        const gchar *text )
 {
     const gchar *element_name;
 
@@ -7880,7 +7890,7 @@
 
 
 gint cmp_int (struct reconcile_conversion_struct *reconcile_1,
-                    struct reconcile_conversion_struct *reconcile_2)
+                        struct reconcile_conversion_struct *reconcile_2)
 {
     gint num_1, num_2, num_3, num_4;
 

Index: gsb_plugins.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_plugins.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gsb_plugins.c	26 Apr 2009 17:39:34 -0000	1.19
+++ gsb_plugins.c	27 Apr 2009 19:41:03 -0000	1.20
@@ -28,9 +28,9 @@
 /*END_INCLUDE*/
 
 /*START_EXTERN*/
-extern G_MODULE_EXPORT const gchar plugin_name[] ;
-extern G_MODULE_EXPORT const gchar plugin_name[] ;
-extern G_MODULE_EXPORT const gchar plugin_name[] ;
+extern G_MODULE_EXPORT const gchar plugin_name[];
+extern G_MODULE_EXPORT const gchar plugin_name[];
+extern G_MODULE_EXPORT const gchar plugin_name[];
 /*END_EXTERN*/
 
 /*START_STATIC*/

Index: gsb_data_currency_link.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_currency_link.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gsb_data_currency_link.c	26 Apr 2009 17:39:34 -0000	1.14
+++ gsb_data_currency_link.c	27 Apr 2009 19:41:03 -0000	1.15
@@ -62,7 +62,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 /** contains the g_slist of struct_currency_link */

Index: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- main.c	26 Apr 2009 17:39:35 -0000	1.140
+++ main.c	27 Apr 2009 19:41:03 -0000	1.141
@@ -76,10 +76,10 @@
 
 
 /*START_EXTERN*/
-extern FILE *debug_file ;
+extern FILE *debug_file;
 extern gint hauteur_window;
 extern gint largeur_window;
-extern gchar *nom_fichier_comptes ;
+extern gchar *nom_fichier_comptes;
 /*END_EXTERN*/
 
 /**

Index: gsb_file_load.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_load.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gsb_file_load.h	18 Feb 2007 12:37:18 -0000	1.6
+++ gsb_file_load.h	27 Apr 2009 19:41:03 -0000	1.7
@@ -8,23 +8,23 @@
 
 /* START_DECLARATION */
 void gsb_file_load_amount_comparison ( const gchar **attribute_names,
-				       const gchar **attribute_values );
+                        const gchar **attribute_values );
 void gsb_file_load_budgetary ( const gchar **attribute_names,
-			       const gchar **attribute_values );
+                        const gchar **attribute_values );
 void gsb_file_load_category ( const gchar **attribute_names,
-			      const gchar **attribute_values );
+                        const gchar **attribute_values );
 void gsb_file_load_error ( GMarkupParseContext *context,
-			   GError *error,
-			   gpointer user_data );
+                        GError *error,
+                        gpointer user_data );
 gboolean gsb_file_load_open_file ( gchar *filename );
 void gsb_file_load_report ( const gchar **attribute_names,
-			    const gchar **attribute_values );
+                        const gchar **attribute_values );
 void gsb_file_load_sub_budgetary ( const gchar **attribute_names,
-				   const gchar **attribute_values);
+                        const gchar **attribute_values);
 void gsb_file_load_sub_category ( const gchar **attribute_names,
-				  const gchar **attribute_values);
+                        const gchar **attribute_values);
 void gsb_file_load_text_comparison ( const gchar **attribute_names,
-				     const gchar **attribute_values );
+                        const gchar **attribute_values );
 /* END_DECLARATION */
 #endif
 

Index: gsb_autofunc.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_autofunc.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gsb_autofunc.c	26 Apr 2009 17:39:34 -0000	1.20
+++ gsb_autofunc.c	27 Apr 2009 19:41:03 -0000	1.21
@@ -72,7 +72,7 @@
 
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: gsb_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- gsb_account.c	26 Apr 2009 17:39:34 -0000	1.43
+++ gsb_account.c	27 Apr 2009 19:41:03 -0000	1.44
@@ -60,12 +60,12 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *account_page ;
+extern GtkWidget *account_page;
 extern gint mise_a_jour_fin_comptes_passifs;
 extern gint mise_a_jour_liste_comptes_accueil;
 extern gint mise_a_jour_liste_echeances_manuelles_accueil;
 extern gint mise_a_jour_soldes_minimaux;
-extern GtkWidget *notebook_general ;
+extern GtkWidget *notebook_general;
 /*END_EXTERN*/
 
 

Index: help.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/help.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- help.c	26 Apr 2009 17:39:34 -0000	1.85
+++ help.c	27 Apr 2009 19:41:03 -0000	1.86
@@ -37,7 +37,7 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gtk_combofix.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gtk_combofix.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- gtk_combofix.c	26 Apr 2009 17:39:34 -0000	1.60
+++ gtk_combofix.c	27 Apr 2009 19:41:03 -0000	1.61
@@ -106,7 +106,7 @@
 
 /*START_EXTERN*/
 extern gint max;
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_data_scheduled.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_scheduled.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gsb_data_scheduled.c	26 Apr 2009 17:39:34 -0000	1.25
+++ gsb_data_scheduled.c	27 Apr 2009 19:41:03 -0000	1.26
@@ -92,7 +92,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: gsb_file.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- gsb_file.c	26 Apr 2009 17:39:34 -0000	1.44
+++ gsb_file.c	27 Apr 2009 19:41:03 -0000	1.45
@@ -83,20 +83,20 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *main_hpaned ;
-extern GtkWidget *main_vbox ;
+extern GtkWidget *main_hpaned;
+extern GtkWidget *main_vbox;
 extern gint max;
-extern GtkWidget * navigation_tree_view ;
-extern gsize nb_derniers_fichiers_ouverts ;
-extern gint nb_max_derniers_fichiers_ouverts ;
-extern gchar *nom_fichier_comptes ;
-extern GtkWidget *notebook_general ;
-extern gchar **tab_noms_derniers_fichiers_ouverts ;
-extern GtkWidget *table_etat ;
-extern gchar *titre_fichier ;
-extern GtkWidget *tree_view_vbox ;
-extern GtkWidget *window ;
-extern GtkWidget *window_vbox_principale ;
+extern GtkWidget * navigation_tree_view;
+extern gsize nb_derniers_fichiers_ouverts;
+extern gint nb_max_derniers_fichiers_ouverts;
+extern gchar *nom_fichier_comptes;
+extern GtkWidget *notebook_general;
+extern gchar **tab_noms_derniers_fichiers_ouverts;
+extern GtkWidget *table_etat;
+extern gchar *titre_fichier;
+extern GtkWidget *tree_view_vbox;
+extern GtkWidget *window;
+extern GtkWidget *window_vbox_principale;
 /*END_EXTERN*/
 
 

Index: parametres.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parametres.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- parametres.c	26 Apr 2009 17:39:35 -0000	1.191
+++ parametres.c	27 Apr 2009 19:41:03 -0000	1.192
@@ -84,10 +84,10 @@
 
 /*START_EXTERN*/
 extern gboolean execute_scheduled_of_month;
-extern struct conditional_message messages[] ;
+extern struct conditional_message messages[];
 extern gint nb_days_before_scheduled;
-extern gint nb_max_derniers_fichiers_ouverts ;
-extern GtkWidget *window ;
+extern gint nb_max_derniers_fichiers_ouverts;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- fenetre_principale.c	26 Apr 2009 17:39:34 -0000	1.110
+++ fenetre_principale.c	27 Apr 2009 19:41:03 -0000	1.111
@@ -55,7 +55,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: print_report.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/print_report.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- print_report.c	26 Apr 2009 17:39:35 -0000	1.9
+++ print_report.c	27 Apr 2009 19:41:03 -0000	1.10
@@ -64,7 +64,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *table_etat ;
+extern GtkWidget *table_etat;
 /*END_EXTERN*/
 
 

Index: gsb_form.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- gsb_form.c	26 Apr 2009 17:39:34 -0000	1.118
+++ gsb_form.c	27 Apr 2009 19:41:03 -0000	1.119
@@ -105,8 +105,8 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget * navigation_tree_view ;
-extern GtkWidget *window ;
+extern GtkWidget * navigation_tree_view;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 /** label of the last statement */

Index: gsb_assistant.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- gsb_assistant.c	26 Apr 2009 17:39:34 -0000	1.45
+++ gsb_assistant.c	27 Apr 2009 19:41:03 -0000	1.46
@@ -40,7 +40,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: utils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- utils.c	26 Apr 2009 17:39:35 -0000	1.51
+++ utils.c	27 Apr 2009 19:41:03 -0000	1.52
@@ -39,7 +39,7 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: transaction_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- transaction_list.c	26 Apr 2009 17:39:35 -0000	1.32
+++ transaction_list.c	27 Apr 2009 19:41:03 -0000	1.33
@@ -72,12 +72,12 @@
 extern gint display_one_line;
 extern gint display_three_lines;
 extern gint display_two_lines;
-extern gsb_real null_real ;
-extern GSList *orphan_child_transactions ;
+extern gsb_real null_real;
+extern GSList *orphan_child_transactions;
 extern GdkColor split_background;
 extern gint tab_affichage_ope[TRANSACTION_LIST_ROWS_NB][CUSTOM_MODEL_VISIBLE_COLUMNS];
 extern GdkColor text_color[2];
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_reconcile.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gsb_reconcile.c	26 Apr 2009 17:39:34 -0000	1.34
+++ gsb_reconcile.c	27 Apr 2009 19:41:03 -0000	1.35
@@ -62,9 +62,9 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *label_last_statement ;
+extern GtkWidget *label_last_statement;
 extern gint mise_a_jour_liste_comptes_accueil;
-extern GtkWidget * navigation_tree_view ;
+extern GtkWidget * navigation_tree_view;
 extern GtkWidget * reconcile_panel;
 extern GtkUIManager * ui_manager;
 /*END_EXTERN*/

Index: accueil.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/accueil.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- accueil.c	26 Apr 2009 17:39:34 -0000	1.196
+++ accueil.c	27 Apr 2009 19:41:03 -0000	1.197
@@ -74,11 +74,11 @@
 extern GdkColor couleur_solde_alarme_verte_normal;
 extern GdkColor couleur_solde_alarme_verte_prelight;
 extern GtkWidget *form_transaction_part;
-extern gsb_real null_real ;
+extern gsb_real null_real;
 extern GSList *scheduled_transactions_taken;
 extern GSList *scheduled_transactions_to_take;
-extern gchar *titre_fichier ;
-extern GtkWidget *window ;
+extern gchar *titre_fichier;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 GtkWidget *logo_accueil = NULL;

Index: affichage_liste.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage_liste.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- affichage_liste.c	26 Apr 2009 17:39:34 -0000	1.105
+++ affichage_liste.c	27 Apr 2009 19:41:03 -0000	1.106
@@ -66,7 +66,7 @@
 
 
 /*START_EXTERN*/
-extern GSList *liste_labels_titres_colonnes_liste_ope ;
+extern GSList *liste_labels_titres_colonnes_liste_ope;
 extern gint max;
 extern gchar *tips_col_liste_operations[CUSTOM_MODEL_N_VISIBLES_COLUMN];
 extern gchar *titres_colonnes_liste_operations[CUSTOM_MODEL_N_VISIBLES_COLUMN];

Index: gsb_debug.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_debug.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gsb_debug.c	26 Apr 2009 17:39:34 -0000	1.10
+++ gsb_debug.c	27 Apr 2009 19:41:03 -0000	1.11
@@ -58,7 +58,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 
@@ -374,74 +374,77 @@
     /* Pour chacun des comptes, faire */
     do
     {
-      gpointer p_account = pUserAccountsList -> data;
-      gint account_nb = gsb_data_account_get_no_account ( p_account );
-      gint reconcile_number;
+        gpointer p_account = pUserAccountsList -> data;
+        gint account_nb = gsb_data_account_get_no_account ( p_account );
+        gint reconcile_number;
 
-      /* Si le compte a été rapproché au moins une fois.
-	 Seule la date permet de l'affirmer. */
-      reconcile_number = gsb_data_reconcile_get_account_last_number (account_nb);
-      if (reconcile_number)
-      {
-	  GSList *pTransactionList;
-	  gsb_real reconcilied_amount = null_real;
+        /* Si le compte a été rapproché au moins une fois.
+        * Seule la date permet de l'affirmer. */
+        reconcile_number = gsb_data_reconcile_get_account_last_number (account_nb);
+        if (reconcile_number)
+        {
+        GSList *pTransactionList;
+        gsb_real reconcilied_amount = null_real;
 
-	  /* On va recalculer le montant rapproché du compte (c-à -d le solde initial
-	     plus le montant des opérations rapprochées) et le comparer à la valeur
-	     stockée dans le fichier. Si les valeurs diffèrent, on affiche une boite
-	     d'avertissement */
+        /* On va recalculer le montant rapproché du compte (c-à -d le solde initial
+	     * plus le montant des opérations rapprochées) et le comparer à la valeur
+	     * stockée dans le fichier. Si les valeurs diffèrent, on affiche une boite
+	     * d'avertissement */
       
-	  reconcilied_amount = gsb_data_account_get_init_balance ( account_nb, -1 );
+        reconcilied_amount = gsb_data_account_get_init_balance ( account_nb, -1 );
 
-	  /* On récupère la liste des opérations */
-	  pTransactionList = gsb_data_transaction_get_complete_transactions_list ();;
+        /* On récupère la liste des opérations */
+        pTransactionList = gsb_data_transaction_get_complete_transactions_list ();;
 
-	  while ( pTransactionList )
-	  {
-	      gint transaction = gsb_data_transaction_get_transaction_number ( pTransactionList -> data );
+        while ( pTransactionList )
+        {
+            gint transaction = gsb_data_transaction_get_transaction_number (
+                        pTransactionList -> data );
 
-	      /* On ne prend en compte que les opérations rapprochées.
-		 On ne prend pas en compte les opérations de ventilation. */
-	      if ( gsb_data_transaction_get_account_number (transaction) == account_nb
-		   &&
-		   (gsb_data_transaction_get_marked_transaction ( transaction ) == OPERATION_RAPPROCHEE )
-		   &&
-		   ! gsb_data_transaction_get_split_of_transaction ( transaction ) )
-	      {
-		  reconcilied_amount = gsb_real_add ( reconcilied_amount,
+            /* On ne prend en compte que les opérations rapprochées.
+             * On ne prend pas en compte les sous-opérations ventilées. 
+             * modification aportée pour tenir compte de la transformation ultérieure
+             d'une opération simple en opération ventilée et pour avoir une correspondance
+             * entre le relevé et l'edition de déboggage */
+            if ( gsb_data_transaction_get_account_number (transaction) == account_nb
+            &&
+            (gsb_data_transaction_get_marked_transaction ( transaction ) == OPERATION_RAPPROCHEE )
+            &&
+            ! gsb_data_transaction_get_mother_transaction_number ( transaction ) )
+            {
+            reconcilied_amount = gsb_real_add ( reconcilied_amount,
 						      gsb_data_transaction_get_adjusted_amount_for_currency ( transaction, 
 													      gsb_data_account_get_currency (account_nb),
 													      -1 ));
-	      }
-
-	      pTransactionList = pTransactionList -> next;
-	  }
+            }
+            pTransactionList = pTransactionList -> next;
+        }
 
-	  if ( gsb_real_abs ( gsb_real_sub ( reconcilied_amount,
+        if ( gsb_real_abs ( gsb_real_sub ( reconcilied_amount,
 					     gsb_data_reconcile_get_final_balance (reconcile_number))).mantissa > 0 )
-	  {
-	      affected_accounts ++;
+        {
+            affected_accounts ++;
 
-	      gchar* tmprealstr1 = gsb_real_get_string_with_currency (
+            gchar* tmprealstr1 = gsb_real_get_string_with_currency (
 	                                gsb_data_reconcile_get_final_balance (reconcile_number),
 	                                gsb_data_account_get_currency ( account_nb ), TRUE  );
-	      gchar* tmprealstr2 = gsb_real_get_string_with_currency (reconcilied_amount,
+            gchar* tmprealstr2 = gsb_real_get_string_with_currency (reconcilied_amount,
 					gsb_data_account_get_currency ( account_nb ), TRUE  );
-	      gchar* tmpstr1 = g_strdup_printf ( _("<span weight=\"bold\">%s</span>\n"
+            gchar* tmpstr1 = g_strdup_printf ( _("<span weight=\"bold\">%s</span>\n"
 					"  Last reconciliation amount : %s\n"
 					"  Computed reconciliation amount : %s\n"),
 					gsb_data_account_get_name ( account_nb ), 
 					tmprealstr1,
 					tmprealstr2 );
-	      gchar* tmpstr2 = pText;
-	      pText = g_strconcat ( tmpstr2, tmpstr1, NULL );
-	      g_free ( tmpstr2 );
-	      g_free ( tmpstr1 );
-	      g_free ( tmprealstr1 );
-	      g_free ( tmprealstr2 );
-	  }
-	  tested_account++;
-      }
+            gchar* tmpstr2 = pText;
+            pText = g_strconcat ( tmpstr2, tmpstr1, NULL );
+            g_free ( tmpstr2 );
+            g_free ( tmpstr1 );
+            g_free ( tmprealstr1 );
+            g_free ( tmprealstr2 );
+        }
+        tested_account++;
+        }
     }
     while ( (  pUserAccountsList = pUserAccountsList -> next ) );
 

Index: gsb_data_reconcile.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_reconcile.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gsb_data_reconcile.c	26 Apr 2009 17:39:34 -0000	1.16
+++ gsb_data_reconcile.c	27 Apr 2009 19:41:03 -0000	1.17
@@ -63,7 +63,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern gsb_real null_real ;
+extern gsb_real null_real;
 /*END_EXTERN*/
 
 

Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- gsb_transactions_list.c	26 Apr 2009 17:39:34 -0000	1.158
+++ gsb_transactions_list.c	27 Apr 2009 19:41:03 -0000	1.159
@@ -162,16 +162,16 @@
 
 
 /*START_EXTERN*/
-extern GSList *liste_labels_titres_colonnes_liste_ope ;
+extern GSList *liste_labels_titres_colonnes_liste_ope;
 extern gint mise_a_jour_fin_comptes_passifs;
 extern gint mise_a_jour_liste_comptes_accueil;
 extern gint mise_a_jour_liste_echeances_auto_accueil;
 extern gint mise_a_jour_soldes_minimaux;
-extern GtkWidget * navigation_tree_view ;
-extern GtkWidget *notebook_general ;
+extern GtkWidget * navigation_tree_view;
+extern GtkWidget *notebook_general;
 extern GtkWidget *reconcile_sort_list_button;
 extern gint tab_affichage_ope[TRANSACTION_LIST_ROWS_NB][CUSTOM_MODEL_VISIBLE_COLUMNS];
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 
@@ -844,7 +844,7 @@
 {
     gint account_number;
     gchar *string;
-    gsb_real current_balance;
+    //~ gsb_real current_balance;
 
     devel_debug_int (transaction_number);
 
@@ -857,6 +857,8 @@
     account_number = gsb_data_transaction_get_account_number (transaction_number);
 
     /* update the current balance */
+    /* mis en commentaire car cela modifie le solde du compte même si on ne modifie pas
+     * le montant de l'opération voir impacts sur une modification du solde. */
     //~ current_balance = gsb_real_add ( gsb_data_account_get_current_balance (account_number),
 				     //~ gsb_data_transaction_get_adjusted_amount (transaction_number, -1));
     //~ gsb_data_account_set_current_balance ( account_number,

Index: go-optionmenu.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/go-optionmenu.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- go-optionmenu.c	26 Apr 2009 17:39:34 -0000	1.10
+++ go-optionmenu.c	27 Apr 2009 19:41:03 -0000	1.11
@@ -97,7 +97,7 @@
 /*END_STATIC*/
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: categories_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/categories_onglet.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- categories_onglet.c	26 Apr 2009 17:39:34 -0000	1.192
+++ categories_onglet.c	27 Apr 2009 19:41:03 -0000	1.193
@@ -67,8 +67,8 @@
 static gboolean sortie_edit_category = FALSE;
 
 /*START_EXTERN*/
-extern MetatreeInterface * category_interface ;
-extern GtkWidget *window ;
+extern MetatreeInterface * category_interface;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_bank.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_bank.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gsb_bank.c	26 Apr 2009 17:39:34 -0000	1.20
+++ gsb_bank.c	27 Apr 2009 19:41:03 -0000	1.21
@@ -108,7 +108,7 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: utils_files.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_files.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- utils_files.c	26 Apr 2009 17:39:35 -0000	1.39
+++ utils_files.c	27 Apr 2009 19:41:03 -0000	1.40
@@ -45,7 +45,7 @@
 
 
 /*START_EXTERN*/
-extern GtkWidget *window ;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_currency.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- gsb_currency.c	26 Apr 2009 17:39:34 -0000	1.39
+++ gsb_currency.c	27 Apr 2009 19:41:03 -0000	1.40
@@ -95,12 +95,12 @@
 extern GtkWidget *combo_devise_totaux_categ;
 extern GtkWidget *combo_devise_totaux_ib;
 extern GtkWidget *combo_devise_totaux_tiers;
-extern GtkWidget *detail_devise_compte ;
+extern GtkWidget *detail_devise_compte;
 extern gint mise_a_jour_liste_comptes_accueil;
 extern gint mise_a_jour_liste_echeances_auto_accueil;
 extern gint mise_a_jour_liste_echeances_manuelles_accueil;
-extern gsb_real null_real ;
-extern GtkWidget *window ;
+extern gsb_real null_real;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 

Index: gsb_file_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_config.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- gsb_file_config.c	26 Apr 2009 17:39:34 -0000	1.74
+++ gsb_file_config.c	27 Apr 2009 19:41:03 -0000	1.75
@@ -61,12 +61,12 @@
 
 /*START_EXTERN*/
 extern gboolean execute_scheduled_of_month;
-extern GtkWidget *main_hpaned ;
+extern GtkWidget *main_hpaned;
 extern gint max;
-extern struct conditional_message messages[] ;
+extern struct conditional_message messages[];
 extern gint nb_days_before_scheduled;
-extern gchar *nom_fichier_comptes ;
-extern GtkWidget *window ;
+extern gchar *nom_fichier_comptes;
+extern GtkWidget *window;
 /*END_EXTERN*/
 
 gint largeur_window;