[grisbi-cvs] [SCM] grisbi branch, master, updated. 66c6c461de3bfdabc165321b018a79789a83e37e

[Pierre Biava]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  66c6c461de3bfdabc165321b018a79789a83e37e (commit)
      from  fdd1eed85bb3ecbce7178a4a9c00d9c0f0f2ba6f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 66c6c461de3bfdabc165321b018a79789a83e37e
Author: pbiava <pierre.biava at nerim.net>
Date:   Wed Jul 7 22:28:48 2010 +0200

    Fixed a bug that was doubling the transactions in the array of estimates

-----------------------------------------------------------------------

Changes:
diff --git a/src/balance_estimate_data.c b/src/balance_estimate_data.c
index 9f3bd46..1492ec5 100644
--- a/src/balance_estimate_data.c
+++ b/src/balance_estimate_data.c
@@ -1375,10 +1375,10 @@ struct_futur_data *bet_data_future_copy_struct ( struct_futur_data *scheduled )
 /**
  * supprime l'occurence sélectionnée.
  *
- *
+ * \param maj TRUE force la mise à jour
  *
  * */
-gboolean bet_data_future_remove_line ( gint account_number, gint number )
+gboolean bet_data_future_remove_line ( gint account_number, gint number, gboolean maj )
 {
     GHashTableIter iter;
     gpointer key, value;
@@ -1406,8 +1406,11 @@ gboolean bet_data_future_remove_line ( gint account_number, gint number )
     if ( etat.modification_fichier == 0 )
         modification_fichier ( TRUE );
 
-    gsb_data_account_set_bet_maj ( account_number, BET_MAJ_ESTIMATE );
-    bet_data_update_bet_module ( account_number, GSB_ESTIMATE_PAGE );
+    if ( maj )
+    {
+        gsb_data_account_set_bet_maj ( account_number, BET_MAJ_ESTIMATE );
+        bet_data_update_bet_module ( account_number, GSB_ESTIMATE_PAGE );
+    }
 
     return FALSE;
 }
diff --git a/src/balance_estimate_data.h b/src/balance_estimate_data.h
index 3e31df2..5ebd298 100644
--- a/src/balance_estimate_data.h
+++ b/src/balance_estimate_data.h
@@ -92,7 +92,7 @@ gboolean bet_data_future_add_lines ( struct_futur_data *scheduled );
 GHashTable *bet_data_future_get_list ( void );
 struct_futur_data *bet_data_future_get_struct ( gint account_number, gint number );
 gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled );
-gboolean bet_data_future_remove_line ( gint account_number, gint number );
+gboolean bet_data_future_remove_line ( gint account_number, gint number, gboolean maj );
 gboolean bet_data_future_remove_lines ( gint account_number,
                         gint number,
                         gint mother_row );
diff --git a/src/balance_estimate_tab.c b/src/balance_estimate_tab.c
index 3dc2473..0042e78 100644
--- a/src/balance_estimate_tab.c
+++ b/src/balance_estimate_tab.c
@@ -1139,7 +1139,7 @@ gboolean bet_array_refresh_futur_data ( GtkTreeModel *tab_model,
         date_tomorrow = gsb_date_tomorrow ( );
         if ( g_date_compare ( scheduled -> date, date_tomorrow ) < 0 )
         {
-            bet_data_future_remove_line ( account_number, scheduled -> number );
+            bet_data_future_remove_line ( account_number, scheduled -> number, FALSE );
             g_hash_table_iter_init ( &iter, future_list );
             g_date_free ( date_tomorrow );
             if ( g_hash_table_size ( future_list ) == 0 )
@@ -1539,7 +1539,7 @@ void bet_array_list_delete_menu ( GtkWidget *menu_item,
     }
     else if ( origine == SPP_ORIGIN_FUTURE )
     {
-        bet_data_future_remove_line ( gsb_gui_navigation_get_current_account ( ), number );
+        bet_data_future_remove_line ( gsb_gui_navigation_get_current_account ( ), number, TRUE );
     }
     else if ( origine == SPP_ORIGIN_ACCOUNT )
     {


hooks/post-receive
-- 
grisbi