Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4399
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_save.c
gsb_file_util.c gsb_form.c gsb_form.h gsb_form_config.c
gsb_form_scheduler.c gsb_form_scheduler.h
gsb_form_transaction.c gsb_form_transaction.h
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 gsb_transactions_list.h
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:
fix restore last children of splitted transaction for new splitted scheduled
Index: metatree.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- metatree.h 17 Apr 2009 21:49:06 -0000 1.42
+++ metatree.h 26 Apr 2009 17:39:35 -0000 1.43
@@ -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: metatree.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- metatree.c 17 Apr 2009 21:49:06 -0000 1.132
+++ metatree.c 26 Apr 2009 17:39:35 -0000 1.133
@@ -118,7 +118,7 @@
/*START_EXTERN*/
-extern GtkTreeModel * navigation_model;
+extern GtkTreeModel * navigation_model ;
/*END_EXTERN*/
Index: go-optionmenu.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/go-optionmenu.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- go-optionmenu.c 5 Mar 2009 19:12:29 -0000 1.9
+++ go-optionmenu.c 26 Apr 2009 17:39:34 -0000 1.10
@@ -97,7 +97,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
Index: dialog.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/dialog.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- dialog.c 5 Mar 2009 19:12:28 -0000 1.69
+++ dialog.c 26 Apr 2009 17:39:34 -0000 1.70
@@ -41,7 +41,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.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- transaction_list.c 18 Mar 2009 21:48:28 -0000 1.31
+++ transaction_list.c 26 Apr 2009 17:39:35 -0000 1.32
@@ -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: export.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/export.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- export.c 5 Mar 2009 19:12:29 -0000 1.24
+++ export.c 26 Apr 2009 17:39:34 -0000 1.25
@@ -51,7 +51,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gchar *titre_fichier;
+extern gchar *titre_fichier ;
/*END_EXTERN*/
Index: gsb_assistant_archive_export.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_archive_export.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gsb_assistant_archive_export.c 5 Mar 2009 19:12:29 -0000 1.15
+++ gsb_assistant_archive_export.c 26 Apr 2009 17:39:34 -0000 1.16
@@ -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.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- gsb_data_account.c 7 Apr 2009 21:07:40 -0000 1.68
+++ gsb_data_account.c 26 Apr 2009 17:39:34 -0000 1.69
@@ -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*/
Index: gsb_assistant_first.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_first.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gsb_assistant_first.c 3 Apr 2009 19:42:11 -0000 1.22
+++ gsb_assistant_first.c 26 Apr 2009 17:39:34 -0000 1.23
@@ -49,7 +49,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
enum first_assistant_page
Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- import.c 4 Apr 2009 19:51:41 -0000 1.273
+++ import.c 26 Apr 2009 17:39:34 -0000 1.274
@@ -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: gsb_file_load.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_load.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- gsb_file_load.c 24 Apr 2009 21:43:00 -0000 1.165
+++ gsb_file_load.c 26 Apr 2009 17:39:34 -0000 1.166
@@ -74,7 +74,76 @@
#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
+{
+ gint reconcile_number;
+ gint account_number;
+ GDate *final_date;
+ 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);
static void gsb_file_load_account_part ( const gchar **attribute_names,
const gchar **attribute_values );
static void gsb_file_load_account_part_before_0_6 ( GMarkupParseContext *context,
@@ -125,25 +194,25 @@
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;
@@ -154,87 +223,23 @@
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;
-};
-
-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);
/**
* called to open the grisbi file given in param
Index: gsb_autofunc.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_autofunc.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gsb_autofunc.c 30 Mar 2009 15:11:08 -0000 1.19
+++ gsb_autofunc.c 26 Apr 2009 17:39:34 -0000 1.20
@@ -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.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- gsb_account.c 5 Mar 2009 19:12:29 -0000 1.42
+++ gsb_account.c 26 Apr 2009 17:39:34 -0000 1.43
@@ -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: gtk_combofix.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gtk_combofix.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- gtk_combofix.c 4 Apr 2009 19:51:41 -0000 1.59
+++ gtk_combofix.c 26 Apr 2009 17:39:34 -0000 1.60
@@ -106,7 +106,7 @@
/*START_EXTERN*/
extern gint max;
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
Index: gsb_file.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- gsb_file.c 5 Mar 2009 19:12:29 -0000 1.43
+++ gsb_file.c 26 Apr 2009 17:39:34 -0000 1.44
@@ -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: gsb_assistant.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- gsb_assistant.c 5 Mar 2009 19:12:29 -0000 1.44
+++ gsb_assistant.c 26 Apr 2009 17:39:34 -0000 1.45
@@ -40,7 +40,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
Index: gsb_account_property.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account_property.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gsb_account_property.c 17 Apr 2009 21:49:06 -0000 1.33
+++ gsb_account_property.c 26 Apr 2009 17:39:34 -0000 1.34
@@ -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: gsb_form_scheduler.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_scheduler.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gsb_form_scheduler.h 7 Oct 2008 07:35:46 -0000 1.3
+++ gsb_form_scheduler.h 26 Apr 2009 17:39:34 -0000 1.4
@@ -31,6 +31,8 @@
gint gsb_form_scheduler_get_account ( void );
GtkWidget *gsb_form_scheduler_get_element_widget ( gint element_number );
gboolean gsb_form_scheduler_get_scheduler_part ( gint scheduled_number );
+gboolean gsb_form_scheduler_recover_splits_of_transaction ( gint scheduled_transaction,
+ gint transaction_number );
gboolean gsb_form_scheduler_sensitive_buttons ( gboolean sensitive );
gboolean gsb_form_scheduler_set ( gint scheduled_number );
gboolean gsb_form_scheduler_set_frequency ( gint frequency );
Index: help.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/help.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- help.c 5 Mar 2009 19:12:30 -0000 1.84
+++ help.c 26 Apr 2009 17:39:34 -0000 1.85
@@ -37,7 +37,7 @@
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
Index: gsb_form_scheduler.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_scheduler.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- gsb_form_scheduler.c 26 Apr 2009 15:41:22 -0000 1.31
+++ gsb_form_scheduler.c 26 Apr 2009 17:39:34 -0000 1.32
@@ -41,6 +41,8 @@
#include "./gsb_form_widget.h"
#include "./gsb_fyear.h"
#include "./gsb_payment_method.h"
+#include "./gsb_scheduler_list.h"
+#include "./gsb_transactions_list.h"
#include "./gtk_combofix.h"
#include "./utils_str.h"
#include "./gtk_combofix.h"
@@ -1226,3 +1228,34 @@
}
+/**
+ * Clone the children of a splitted transaction to add the to the new splitted scheduled
+ *
+ * \param scheduled_transaction the splitted scheduled transaction we want to add the children
+ * \param transaction_number the splitted transaction we want to clone the children
+ *
+ * \return FALSE
+ * */
+gboolean gsb_form_scheduler_recover_splits_of_transaction ( gint scheduled_transaction,
+ gint transaction_number )
+{
+ GSList *tmp_list;
+
+ /* first clone the transactions */
+ gsb_transactions_list_splitted_to_scheduled (transaction_number, scheduled_transaction);
+
+ /* add the children to the list */
+ tmp_list = gsb_data_scheduled_get_scheduled_list ();
+ while (tmp_list)
+ {
+ gint scheduled_number = gsb_data_scheduled_get_scheduled_number (tmp_list -> data);
+
+ if (gsb_data_scheduled_get_mother_scheduled_number (scheduled_number) == scheduled_transaction)
+ gsb_scheduler_list_append_new_scheduled (scheduled_number, NULL);
+ tmp_list = tmp_list -> next;
+ }
+ return FALSE;
+}
+
+
+
Index: gsb_crypt.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_crypt.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gsb_crypt.c 5 Mar 2009 19:12:29 -0000 1.14
+++ gsb_crypt.c 26 Apr 2009 17:39:34 -0000 1.15
@@ -36,7 +36,7 @@
/*START_EXTERN*/
extern gchar *crypt_key;
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
#ifndef NOSSL
Index: gsb_file_save.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_save.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- gsb_file_save.c 17 Apr 2009 21:49:06 -0000 1.122
+++ gsb_file_save.c 26 Apr 2009 17:39:34 -0000 1.123
@@ -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: erreur.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/erreur.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- erreur.c 5 Mar 2009 19:12:28 -0000 1.90
+++ erreur.c 26 Apr 2009 17:39:34 -0000 1.91
@@ -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_data_transaction.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_transaction.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- gsb_data_transaction.c 4 Apr 2009 19:51:41 -0000 1.58
+++ gsb_data_transaction.c 26 Apr 2009 17:39:34 -0000 1.59
@@ -105,7 +105,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gsb_real null_real;
+extern gsb_real null_real ;
/*END_EXTERN*/
Index: traitement_variables.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/traitement_variables.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- traitement_variables.c 24 Mar 2009 20:24:41 -0000 1.170
+++ traitement_variables.c 26 Apr 2009 17:39:35 -0000 1.171
@@ -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: gsb_data_category.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_category.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- gsb_data_category.c 7 Apr 2009 21:07:40 -0000 1.66
+++ gsb_data_category.c 26 Apr 2009 17:39:34 -0000 1.67
@@ -102,7 +102,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gsb_real null_real;
+extern gsb_real null_real ;
/*END_EXTERN*/
Index: etats_gtktable.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_gtktable.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- etats_gtktable.c 5 Mar 2009 19:12:29 -0000 1.96
+++ etats_gtktable.c 26 Apr 2009 17:39:34 -0000 1.97
@@ -71,7 +71,7 @@
/*START_EXTERN*/
extern gint nb_colonnes;
-extern GtkWidget *scrolled_window_etat;
+extern GtkWidget *scrolled_window_etat ;
/*END_EXTERN*/
Index: gsb_status.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_status.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gsb_status.c 5 Mar 2009 19:12:30 -0000 1.17
+++ gsb_status.c 26 Apr 2009 17:39:34 -0000 1.18
@@ -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: print_dialog_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/print_dialog_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- print_dialog_config.c 5 Mar 2009 19:12:31 -0000 1.6
+++ print_dialog_config.c 26 Apr 2009 17:39:35 -0000 1.7
@@ -35,7 +35,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
#if GTK_CHECK_VERSION(2,10,0)
Index: gsb_data_payee.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_payee.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- gsb_data_payee.c 21 Apr 2009 20:34:50 -0000 1.45
+++ gsb_data_payee.c 26 Apr 2009 17:39:34 -0000 1.46
@@ -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: gsb_data_payee.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_payee.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gsb_data_payee.h 17 Apr 2009 21:49:06 -0000 1.21
+++ gsb_data_payee.h 26 Apr 2009 17:39:34 -0000 1.22
@@ -3,7 +3,7 @@
/* START_INCLUDE_H */
-#include "./gsb_real.h"
+#include "././gsb_real.h"
/* END_INCLUDE_H */
Index: gsb_select_icon.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_select_icon.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gsb_select_icon.c 19 Apr 2009 20:32:39 -0000 1.11
+++ gsb_select_icon.c 26 Apr 2009 17:39:34 -0000 1.12
@@ -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.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- affichage.c 19 Apr 2009 20:32:39 -0000 1.154
+++ affichage.c 26 Apr 2009 17:39:34 -0000 1.155
@@ -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: accueil.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/accueil.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- accueil.c 5 Mar 2009 19:12:27 -0000 1.195
+++ accueil.c 26 Apr 2009 17:39:34 -0000 1.196
@@ -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: gsb_data_report_amout_comparison.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_report_amout_comparison.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gsb_data_report_amout_comparison.c 5 Mar 2009 19:12:29 -0000 1.12
+++ gsb_data_report_amout_comparison.c 26 Apr 2009 17:39:34 -0000 1.13
@@ -73,7 +73,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gsb_real null_real;
+extern gsb_real null_real ;
/*END_EXTERN*/
Index: gsb_data_currency_link.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_currency_link.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gsb_data_currency_link.c 5 Mar 2009 19:12:29 -0000 1.13
+++ gsb_data_currency_link.c 26 Apr 2009 17:39:34 -0000 1.14
@@ -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: gsb_transactions_list.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- gsb_transactions_list.h 16 Dec 2008 20:40:21 -0000 1.32
+++ gsb_transactions_list.h 26 Apr 2009 17:39:34 -0000 1.33
@@ -65,6 +65,8 @@
void gsb_transactions_list_selection_changed ( gint new_selected_transaction );
gboolean gsb_transactions_list_set_row_align ( gfloat row_align );
void gsb_transactions_list_set_visible_rows_number ( gint rows_number );
+void gsb_transactions_list_splitted_to_scheduled ( gint transaction_number,
+ gint scheduled_number );
gboolean gsb_transactions_list_switch_expander ( gint transaction_number );
gboolean gsb_transactions_list_transaction_visible ( gpointer transaction_ptr,
gint account_number,
Index: parametres.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parametres.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- parametres.c 3 Apr 2009 19:42:11 -0000 1.190
+++ parametres.c 26 Apr 2009 17:39:35 -0000 1.191
@@ -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.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- fenetre_principale.c 5 Mar 2009 19:12:29 -0000 1.109
+++ fenetre_principale.c 26 Apr 2009 17:39:34 -0000 1.110
@@ -55,7 +55,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- gsb_transactions_list.c 20 Apr 2009 17:56:30 -0000 1.157
+++ gsb_transactions_list.c 26 Apr 2009 17:39:34 -0000 1.158
@@ -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*/
@@ -2697,7 +2697,7 @@
gsb_data_scheduled_set_sub_budgetary_number ( scheduled_number,
gsb_data_transaction_get_sub_budgetary_number (transaction_number));
gsb_data_scheduled_set_split_of_scheduled ( scheduled_number,
- gsb_data_transaction_get_split_of_transaction (transaction_number));
+ gsb_data_transaction_get_split_of_transaction (transaction_number));
/* par défaut, on met en manuel, pour éviter si l'utilisateur se gourre dans la date, */
/* (c'est le cas, Ã 0 avec g_malloc0) */
@@ -2710,96 +2710,109 @@
/* on récupère les opés de ventil si c'était une opé ventilée */
if ( gsb_data_scheduled_get_split_of_scheduled ( scheduled_number))
+ gsb_transactions_list_splitted_to_scheduled (transaction_number, scheduled_number);
+ return scheduled_number;
+}
+
+
+
+/**
+ * clone the splitted children of a transaction to splitted children of the scheduled transaction
+ *
+ * \param transaction_number mother of the splitted children we look for
+ * \param scheduled_number splitted scheduled transaction we want to add the children
+ *
+ * \return
+ * */
+void gsb_transactions_list_splitted_to_scheduled ( gint transaction_number,
+ gint scheduled_number )
+{
+ GSList *list_tmp_transactions;
+ list_tmp_transactions = gsb_data_transaction_get_transactions_list ();
+
+ while ( list_tmp_transactions )
{
- GSList *list_tmp_transactions;
- list_tmp_transactions = gsb_data_transaction_get_transactions_list ();
+ gint transaction_number_tmp;
+ transaction_number_tmp = gsb_data_transaction_get_transaction_number (list_tmp_transactions -> data);
- while ( list_tmp_transactions )
+ if ( gsb_data_transaction_get_account_number (transaction_number_tmp) == gsb_data_transaction_get_account_number (transaction_number)
+ &&
+ gsb_data_transaction_get_mother_transaction_number (transaction_number_tmp) == transaction_number)
{
- gint transaction_number_tmp;
- transaction_number_tmp = gsb_data_transaction_get_transaction_number (list_tmp_transactions -> data);
-
- if ( gsb_data_transaction_get_account_number (transaction_number_tmp) == gsb_data_transaction_get_account_number (transaction_number)
- &&
- gsb_data_transaction_get_mother_transaction_number (transaction_number_tmp) == transaction_number)
- {
- gint split_scheduled_number;
+ gint split_scheduled_number;
- split_scheduled_number = gsb_data_scheduled_new_scheduled ();
+ split_scheduled_number = gsb_data_scheduled_new_scheduled ();
- if ( !split_scheduled_number)
- return FALSE;
+ if ( !split_scheduled_number)
+ return;
- gsb_data_scheduled_set_account_number ( split_scheduled_number,
- gsb_data_transaction_get_account_number (transaction_number_tmp));
- gsb_data_scheduled_set_date ( split_scheduled_number,
- gsb_data_transaction_get_date (transaction_number_tmp));
- gsb_data_scheduled_set_amount ( split_scheduled_number,
- gsb_data_transaction_get_amount (transaction_number_tmp));
- gsb_data_scheduled_set_currency_number ( split_scheduled_number,
- gsb_data_transaction_get_currency_number (transaction_number_tmp));
- gsb_data_scheduled_set_party_number ( split_scheduled_number,
- gsb_data_transaction_get_party_number (transaction_number_tmp));
- gsb_data_scheduled_set_category_number ( split_scheduled_number,
- gsb_data_transaction_get_category_number (transaction_number_tmp));
- gsb_data_scheduled_set_sub_category_number ( split_scheduled_number,
- gsb_data_transaction_get_sub_category_number (transaction_number_tmp));
+ gsb_data_scheduled_set_account_number ( split_scheduled_number,
+ gsb_data_transaction_get_account_number (transaction_number_tmp));
+ gsb_data_scheduled_set_date ( split_scheduled_number,
+ gsb_data_transaction_get_date (transaction_number_tmp));
+ gsb_data_scheduled_set_amount ( split_scheduled_number,
+ gsb_data_transaction_get_amount (transaction_number_tmp));
+ gsb_data_scheduled_set_currency_number ( split_scheduled_number,
+ gsb_data_transaction_get_currency_number (transaction_number_tmp));
+ gsb_data_scheduled_set_party_number ( split_scheduled_number,
+ gsb_data_transaction_get_party_number (transaction_number_tmp));
+ gsb_data_scheduled_set_category_number ( split_scheduled_number,
+ gsb_data_transaction_get_category_number (transaction_number_tmp));
+ gsb_data_scheduled_set_sub_category_number ( split_scheduled_number,
+ gsb_data_transaction_get_sub_category_number (transaction_number_tmp));
- /* pour 1 virement, categ et sous categ sont à 0, et compte_virement contient le no de compte */
- /* mais si categ et sous categ sont à 0 et que ce n'est pas un virement, compte_virement = -1 */
- /* on va changer ça la prochaine version, dès que c'est pas un virement -> -1 */
+ /* pour 1 virement, categ et sous categ sont à 0, et compte_virement contient le no de compte */
+ /* mais si categ et sous categ sont à 0 et que ce n'est pas un virement, compte_virement = -1 */
+ /* on va changer ça la prochaine version, dès que c'est pas un virement -> -1 */
- if ( gsb_data_transaction_get_contra_transaction_number (transaction_number_tmp) > 0)
- {
- /* c'est un virement, on met la relation et on recherche le type de la contre opération */
+ if ( gsb_data_transaction_get_contra_transaction_number (transaction_number_tmp) > 0)
+ {
+ /* c'est un virement, on met la relation et on recherche le type de la contre opération */
- gint contra_transaction_number;
+ gint contra_transaction_number;
- gsb_data_scheduled_set_account_number_transfer ( split_scheduled_number,
- gsb_data_transaction_get_contra_transaction_account (transaction_number_tmp));
+ gsb_data_scheduled_set_account_number_transfer ( split_scheduled_number,
+ gsb_data_transaction_get_contra_transaction_account (transaction_number_tmp));
- contra_transaction_number = gsb_data_transaction_get_contra_transaction_number (transaction_number_tmp);
+ contra_transaction_number = gsb_data_transaction_get_contra_transaction_number (transaction_number_tmp);
- gsb_data_scheduled_set_contra_method_of_payment_number ( split_scheduled_number,
- gsb_data_transaction_get_method_of_payment_number (contra_transaction_number));
- }
- else
- if ( !gsb_data_scheduled_get_category_number (split_scheduled_number))
- gsb_data_scheduled_set_account_number_transfer ( split_scheduled_number,
- -1 );
+ gsb_data_scheduled_set_contra_method_of_payment_number ( split_scheduled_number,
+ gsb_data_transaction_get_method_of_payment_number (contra_transaction_number));
+ }
+ else
+ if ( !gsb_data_scheduled_get_category_number (split_scheduled_number))
+ gsb_data_scheduled_set_account_number_transfer ( split_scheduled_number,
+ -1 );
- gsb_data_scheduled_set_notes ( split_scheduled_number,
- gsb_data_transaction_get_notes (transaction_number_tmp));
- gsb_data_scheduled_set_method_of_payment_number ( split_scheduled_number,
- gsb_data_transaction_get_method_of_payment_number (transaction_number_tmp));
- gsb_data_scheduled_set_method_of_payment_content ( split_scheduled_number,
- gsb_data_transaction_get_method_of_payment_content (transaction_number_tmp));
- gsb_data_scheduled_set_financial_year_number ( split_scheduled_number,
- gsb_data_transaction_get_financial_year_number (transaction_number_tmp));
- gsb_data_scheduled_set_budgetary_number ( split_scheduled_number,
- gsb_data_transaction_get_budgetary_number (transaction_number_tmp));
- gsb_data_scheduled_set_sub_budgetary_number ( split_scheduled_number,
- gsb_data_transaction_get_sub_budgetary_number (transaction_number_tmp));
+ gsb_data_scheduled_set_notes ( split_scheduled_number,
+ gsb_data_transaction_get_notes (transaction_number_tmp));
+ gsb_data_scheduled_set_method_of_payment_number ( split_scheduled_number,
+ gsb_data_transaction_get_method_of_payment_number (transaction_number_tmp));
+ gsb_data_scheduled_set_method_of_payment_content ( split_scheduled_number,
+ gsb_data_transaction_get_method_of_payment_content (transaction_number_tmp));
+ gsb_data_scheduled_set_financial_year_number ( split_scheduled_number,
+ gsb_data_transaction_get_financial_year_number (transaction_number_tmp));
+ gsb_data_scheduled_set_budgetary_number ( split_scheduled_number,
+ gsb_data_transaction_get_budgetary_number (transaction_number_tmp));
+ gsb_data_scheduled_set_sub_budgetary_number ( split_scheduled_number,
+ gsb_data_transaction_get_sub_budgetary_number (transaction_number_tmp));
- gsb_data_scheduled_set_mother_scheduled_number ( split_scheduled_number,
- scheduled_number );
+ gsb_data_scheduled_set_mother_scheduled_number ( split_scheduled_number,
+ scheduled_number );
- /* par défaut, on met en manuel, pour éviter si l'utilisateur se gourre dans la date, */
- /* (c'est le cas, Ã 0 avec g_malloc0) */
- /* que l'opé soit enregistrée immédiatement ; de même on le met en mensuel par défaut */
- /* pour la même raison */
+ /* par défaut, on met en manuel, pour éviter si l'utilisateur se gourre dans la date, */
+ /* (c'est le cas, Ã 0 avec g_malloc0) */
+ /* que l'opé soit enregistrée immédiatement ; de même on le met en mensuel par défaut */
+ /* pour la même raison */
- gsb_data_scheduled_set_frequency ( split_scheduled_number,
- 2);
- }
- list_tmp_transactions = list_tmp_transactions -> next;
+ gsb_data_scheduled_set_frequency ( split_scheduled_number,
+ 2);
}
+ list_tmp_transactions = list_tmp_transactions -> next;
}
- return scheduled_number;
}
-
/**
* called when press a button on the title column
* check the right click and show a popup to chose the element number of
Index: gsb_reconcile.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gsb_reconcile.c 5 Mar 2009 19:12:29 -0000 1.33
+++ gsb_reconcile.c 26 Apr 2009 17:39:34 -0000 1.34
@@ -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: utils_files.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_files.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- utils_files.c 13 Mar 2009 20:15:38 -0000 1.38
+++ utils_files.c 26 Apr 2009 17:39:35 -0000 1.39
@@ -45,7 +45,7 @@
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
Index: gsb_form_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_config.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- gsb_form_config.c 5 Mar 2009 19:12:29 -0000 1.27
+++ gsb_form_config.c 26 Apr 2009 17:39:34 -0000 1.28
@@ -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: gsb_scheduler_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler_list.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- gsb_scheduler_list.c 26 Apr 2009 11:27:22 -0000 1.60
+++ gsb_scheduler_list.c 26 Apr 2009 17:39:34 -0000 1.61
@@ -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: etats_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_config.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- etats_config.c 5 Mar 2009 19:12:28 -0000 1.168
+++ etats_config.c 26 Apr 2009 17:39:34 -0000 1.169
@@ -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: gsb_assistant_file.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_file.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gsb_assistant_file.c 5 Mar 2009 19:12:29 -0000 1.16
+++ gsb_assistant_file.c 26 Apr 2009 17:39:34 -0000 1.17
@@ -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: gsb_data_archive_store.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_archive_store.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gsb_data_archive_store.c 5 Mar 2009 19:12:29 -0000 1.12
+++ gsb_data_archive_store.c 26 Apr 2009 17:39:34 -0000 1.13
@@ -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: gsb_currency_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency_config.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- gsb_currency_config.c 22 Feb 2009 20:55:15 -0000 1.48
+++ gsb_currency_config.c 26 Apr 2009 17:39:34 -0000 1.49
@@ -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.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- tiers_onglet.c 7 Apr 2009 21:07:40 -0000 1.157
+++ tiers_onglet.c 26 Apr 2009 17:39:35 -0000 1.158
@@ -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: gsb_data_budget.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_budget.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gsb_data_budget.c 7 Apr 2009 21:07:40 -0000 1.47
+++ gsb_data_budget.c 26 Apr 2009 17:39:34 -0000 1.48
@@ -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: print_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/print_config.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- print_config.c 5 Mar 2009 19:12:31 -0000 1.43
+++ print_config.c 26 Apr 2009 17:39:35 -0000 1.44
@@ -58,7 +58,7 @@
};
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
Index: utils_editables.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_editables.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- utils_editables.c 5 Mar 2009 19:12:31 -0000 1.29
+++ utils_editables.c 26 Apr 2009 17:39:35 -0000 1.30
@@ -34,7 +34,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gsb_real null_real;
+extern gsb_real null_real ;
/*END_EXTERN*/
Index: meta_budgetary.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/meta_budgetary.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- meta_budgetary.c 5 Mar 2009 19:12:30 -0000 1.34
+++ meta_budgetary.c 26 Apr 2009 17:39:35 -0000 1.35
@@ -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: categories_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/categories_onglet.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- categories_onglet.c 19 Mar 2009 22:31:38 -0000 1.191
+++ categories_onglet.c 26 Apr 2009 17:39:34 -0000 1.192
@@ -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_calendar_entry.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_calendar_entry.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gsb_calendar_entry.c 5 Mar 2009 19:12:29 -0000 1.23
+++ gsb_calendar_entry.c 26 Apr 2009 17:39:34 -0000 1.24
@@ -64,7 +64,7 @@
/*START_EXTERN*/
extern GdkColor calendar_entry_color;
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
#define ENTRY_NORMAL 0
Index: utils_operations.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_operations.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- utils_operations.c 5 Mar 2009 19:12:31 -0000 1.30
+++ utils_operations.c 26 Apr 2009 17:39:35 -0000 1.31
@@ -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: balance_estimate_tab.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_tab.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- balance_estimate_tab.c 5 Mar 2009 19:12:28 -0000 1.20
+++ balance_estimate_tab.c 26 Apr 2009 17:39:34 -0000 1.21
@@ -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: meta_categories.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/meta_categories.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- meta_categories.c 5 Mar 2009 19:12:30 -0000 1.45
+++ meta_categories.c 26 Apr 2009 17:39:35 -0000 1.46
@@ -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: etats_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_onglet.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- etats_onglet.c 3 Apr 2009 19:42:11 -0000 1.132
+++ etats_onglet.c 26 Apr 2009 17:39:34 -0000 1.133
@@ -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: meta_payee.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/meta_payee.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- meta_payee.c 5 Mar 2009 19:12:30 -0000 1.31
+++ meta_payee.c 26 Apr 2009 17:39:35 -0000 1.32
@@ -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_archive_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_archive_config.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gsb_archive_config.c 5 Mar 2009 19:12:29 -0000 1.20
+++ gsb_archive_config.c 26 Apr 2009 17:39:34 -0000 1.21
@@ -79,7 +79,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
/**
Index: etats_calculs.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_calculs.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- etats_calculs.c 5 Mar 2009 19:12:28 -0000 1.130
+++ etats_calculs.c 26 Apr 2009 17:39:34 -0000 1.131
@@ -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 gtktable_affichage;
-extern struct struct_etat_affichage latex_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_form.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gsb_form.h 6 Feb 2009 22:05:04 -0000 1.25
+++ gsb_form.h 26 Apr 2009 17:39:34 -0000 1.26
@@ -30,7 +30,7 @@
gboolean gsb_form_change_sensitive_buttons ( gboolean sensitive );
void gsb_form_check_auto_separator ( GtkWidget *entry );
gboolean gsb_form_clean ( gint account_number );
-void gsb_form_create_widgets ();
+void gsb_form_create_widgets ( void );
gboolean gsb_form_entry_get_focus ( GtkWidget *entry );
gboolean gsb_form_entry_lose_focus ( GtkWidget *entry,
GdkEventFocus *ev,
@@ -49,7 +49,7 @@
GtkWidget *gsb_form_get_form_widget ( void );
gint gsb_form_get_origin ( void );
GtkWidget *gsb_form_get_scheduler_part ( void );
-gboolean gsb_form_is_visible ();
+gboolean gsb_form_is_visible ( void );
gboolean gsb_form_key_press_event ( GtkWidget *widget,
GdkEventKey *ev,
gint *ptr_origin );
Index: gsb_form.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- gsb_form.c 26 Apr 2009 06:56:41 -0000 1.117
+++ gsb_form.c 26 Apr 2009 17:39:34 -0000 1.118
@@ -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 */
@@ -2316,10 +2316,10 @@
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (form_button_recover_split))
&&
(split_transaction_number = gsb_form_transactions_look_for_last_party ( gsb_data_transaction_get_party_number (transaction_number),
- transaction_number,
- gsb_data_transaction_get_account_number(transaction_number))))
+ transaction_number,
+ gsb_data_transaction_get_account_number(transaction_number))))
gsb_form_transaction_recover_splits_of_transaction ( transaction_number,
- split_transaction_number);
+ split_transaction_number);
}
else
{
@@ -2342,10 +2342,24 @@
gsb_form_scheduler_get_scheduler_part (transaction_number);
if (new_transaction)
- gsb_scheduler_list_append_new_scheduled ( transaction_number,
- gsb_scheduler_list_get_end_date_scheduled_showed ());
+ {
+ gint split_transaction_number;
+
+ gsb_scheduler_list_append_new_scheduled ( transaction_number,
+ gsb_scheduler_list_get_end_date_scheduled_showed ());
+ /* recover if necessary previous children */
+ if (gsb_data_scheduled_get_split_of_scheduled (transaction_number)
+ &&
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (form_button_recover_split))
+ &&
+ (split_transaction_number = gsb_form_transactions_look_for_last_party ( gsb_data_scheduled_get_party_number (transaction_number),
+ 0,
+ gsb_data_scheduled_get_account_number(transaction_number))))
+ gsb_form_scheduler_recover_splits_of_transaction ( transaction_number,
+ split_transaction_number);
+ }
else
- gsb_scheduler_list_update_transaction_in_list (transaction_number);
+ gsb_scheduler_list_update_transaction_in_list (transaction_number);
/* needed for the two in case of we change the date */
gsb_scheduler_list_set_background_color (gsb_scheduler_list_get_tree_view ());
Index: gsb_data_reconcile.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_reconcile.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gsb_data_reconcile.c 5 Mar 2009 19:12:29 -0000 1.15
+++ gsb_data_reconcile.c 26 Apr 2009 17:39:34 -0000 1.16
@@ -63,7 +63,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gsb_real null_real;
+extern gsb_real null_real ;
/*END_EXTERN*/
Index: gsb_reconcile_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile_config.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gsb_reconcile_config.c 5 Mar 2009 19:12:29 -0000 1.25
+++ gsb_reconcile_config.c 26 Apr 2009 17:39:34 -0000 1.26
@@ -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: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- navigation.c 19 Apr 2009 20:32:39 -0000 1.116
+++ navigation.c 26 Apr 2009 17:39:35 -0000 1.117
@@ -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: etats_affiche.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_affiche.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- etats_affiche.c 5 Mar 2009 19:12:28 -0000 1.104
+++ etats_affiche.c 26 Apr 2009 17:39:34 -0000 1.105
@@ -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: file_obfuscate.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/file_obfuscate.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- file_obfuscate.c 5 Mar 2009 19:12:29 -0000 1.9
+++ file_obfuscate.c 26 Apr 2009 17:39:34 -0000 1.10
@@ -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: menu.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/menu.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- menu.c 30 Mar 2009 15:11:08 -0000 1.144
+++ menu.c 26 Apr 2009 17:39:35 -0000 1.145
@@ -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: barre_outils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/barre_outils.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- barre_outils.c 5 Mar 2009 19:12:28 -0000 1.123
+++ barre_outils.c 26 Apr 2009 17:39:34 -0000 1.124
@@ -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: utils_buttons.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_buttons.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- utils_buttons.c 22 Mar 2009 18:53:25 -0000 1.49
+++ utils_buttons.c 26 Apr 2009 17:39:35 -0000 1.50
@@ -33,7 +33,7 @@
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
Index: gsb_file_util.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_util.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gsb_file_util.c 5 Mar 2009 19:12:29 -0000 1.37
+++ gsb_file_util.c 26 Apr 2009 17:39:34 -0000 1.38
@@ -40,7 +40,7 @@
/*START_EXTERN*/
-extern gchar *nom_fichier_comptes;
+extern gchar *nom_fichier_comptes ;
/*END_EXTERN*/
Index: imputation_budgetaire.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/imputation_budgetaire.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- imputation_budgetaire.c 19 Mar 2009 22:31:38 -0000 1.154
+++ imputation_budgetaire.c 26 Apr 2009 17:39:35 -0000 1.155
@@ -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: gsb_payment_method_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_payment_method_config.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- gsb_payment_method_config.c 5 Mar 2009 19:12:29 -0000 1.32
+++ gsb_payment_method_config.c 26 Apr 2009 17:39:34 -0000 1.33
@@ -80,7 +80,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern GtkWidget *fenetre_preferences;
+extern GtkWidget *fenetre_preferences ;
/*END_EXTERN*/
static GtkWidget *payment_method_treeview;
Index: gsb_plugins.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_plugins.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gsb_plugins.c 5 Mar 2009 19:12:29 -0000 1.18
+++ gsb_plugins.c 26 Apr 2009 17:39:34 -0000 1.19
@@ -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: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- main.c 5 Mar 2009 19:12:30 -0000 1.139
+++ main.c 26 Apr 2009 17:39:35 -0000 1.140
@@ -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_data_scheduled.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_scheduled.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gsb_data_scheduled.c 5 Mar 2009 19:12:29 -0000 1.24
+++ gsb_data_scheduled.c 26 Apr 2009 17:39:34 -0000 1.25
@@ -92,7 +92,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gsb_real null_real;
+extern gsb_real null_real ;
/*END_EXTERN*/
Index: gsb_form_transaction.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_transaction.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- gsb_form_transaction.c 13 Mar 2009 20:15:37 -0000 1.40
+++ gsb_form_transaction.c 26 Apr 2009 17:39:34 -0000 1.41
@@ -255,7 +255,7 @@
* \return FALSE
* */
gboolean gsb_form_transaction_recover_splits_of_transaction ( gint new_transaction_number,
- gint no_last_split )
+ gint no_last_split )
{
GSList *list_tmp_transactions;
Index: affichage_liste.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage_liste.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- affichage_liste.c 5 Mar 2009 19:12:28 -0000 1.104
+++ affichage_liste.c 26 Apr 2009 17:39:34 -0000 1.105
@@ -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: print_report.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/print_report.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- print_report.c 5 Mar 2009 19:12:31 -0000 1.8
+++ print_report.c 26 Apr 2009 17:39:35 -0000 1.9
@@ -64,7 +64,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern GtkWidget *table_etat;
+extern GtkWidget *table_etat ;
/*END_EXTERN*/
Index: gsb_form_transaction.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_transaction.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gsb_form_transaction.h 10 Oct 2008 06:50:39 -0000 1.9
+++ gsb_form_transaction.h 26 Apr 2009 17:39:34 -0000 1.10
@@ -14,7 +14,7 @@
gboolean gsb_form_transaction_complete_form_by_payee ( const gchar *payee_name );
GSList *gsb_form_transaction_get_parties_list_from_report ( void );
gboolean gsb_form_transaction_recover_splits_of_transaction ( gint new_transaction_number,
- gint no_last_split );
+ gint no_last_split );
gint gsb_form_transaction_validate_transfer ( gint transaction_number,
gint new_transaction,
gint account_transfer );
Index: utils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- utils.c 5 Mar 2009 19:12:31 -0000 1.50
+++ utils.c 26 Apr 2009 17:39:35 -0000 1.51
@@ -39,7 +39,7 @@
/*START_EXTERN*/
-extern GtkWidget *window;
+extern GtkWidget *window ;
/*END_EXTERN*/
Index: gsb_debug.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_debug.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gsb_debug.c 5 Mar 2009 19:12:29 -0000 1.9
+++ gsb_debug.c 26 Apr 2009 17:39:34 -0000 1.10
@@ -58,7 +58,7 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gsb_real null_real;
+extern gsb_real null_real ;
/*END_EXTERN*/
Index: gsb_bank.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_bank.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gsb_bank.c 17 Apr 2009 21:49:06 -0000 1.19
+++ gsb_bank.c 26 Apr 2009 17:39:34 -0000 1.20
@@ -108,7 +108,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.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- gsb_currency.c 5 Mar 2009 19:12:29 -0000 1.38
+++ gsb_currency.c 26 Apr 2009 17:39:34 -0000 1.39
@@ -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.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- gsb_file_config.c 30 Mar 2009 15:11:08 -0000 1.73
+++ gsb_file_config.c 26 Apr 2009 17:39:34 -0000 1.74
@@ -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;