[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_2-15-g46e38c0
Philippe Delorme
nobody at users.sourceforge.net
Mon Jun 13 09:40:49 CEST 2011
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 46e38c067e3df3f832e20a0fc0c1b9e17290c01f (commit)
from d77ef3b801f3118087bb836efb1972b5fbbee747 (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 46e38c067e3df3f832e20a0fc0c1b9e17290c01f
Author: Philippe Delorme <philippedelorme at users.sourceforge.net>
Date: Mon Jun 13 09:39:51 2011 +0200
Move some fields back to the etat structure
-----------------------------------------------------------------------
Changes:
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index ff93058..cfb82bc 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -868,7 +868,7 @@ void gsb_file_load_general_part ( const gchar **attribute_names,
else if ( !strcmp ( attribute_names[i], "Reconcile_end_date" ) )
{
- run.reconcile_end_date = utils_str_atoi ( attribute_values[i] );
+ etat.reconcile_end_date = utils_str_atoi ( attribute_values[i] );
}
else if ( !strcmp ( attribute_names[i],
@@ -964,10 +964,10 @@ void gsb_file_load_general_part ( const gchar **attribute_names,
else if ( !strcmp ( attribute_names[i], "Transaction_column_width" ) )
{
/* initialise la réinitialisation des colonnes */
- run.transaction_column_width = my_strdup ( attribute_values[i] );
+ etat.transaction_column_width = my_strdup ( attribute_values[i] );
initialise_largeur_colonnes_tab_affichage_ope ( GSB_ACCOUNT_PAGE,
- run.transaction_column_width );
+ etat.transaction_column_width );
}
else if ( !strcmp ( attribute_names[i], "Transaction_column_align" ) )
@@ -987,10 +987,10 @@ void gsb_file_load_general_part ( const gchar **attribute_names,
else if ( !strcmp ( attribute_names[i], "Scheduler_column_width" ) )
{
/* initialise la réinitialisation des colonnes */
- run.scheduler_column_width = my_strdup ( attribute_values[i] );
+ etat.scheduler_column_width = my_strdup ( attribute_values[i] );
initialise_largeur_colonnes_tab_affichage_ope ( GSB_SCHEDULER_PAGE,
- run.scheduler_column_width );
+ etat.scheduler_column_width );
}
else if ( !strcmp ( attribute_names[i],
diff --git a/src/gsb_file_save.c b/src/gsb_file_save.c
index 00ee99c..322568d 100644
--- a/src/gsb_file_save.c
+++ b/src/gsb_file_save.c
@@ -789,7 +789,7 @@ gulong gsb_file_save_general_part ( gulong iterator,
etat.get_fusion_import_transactions,
etat.get_categorie_for_payee,
etat.get_fyear_by_value_date,
- run.reconcile_end_date,
+ etat.reconcile_end_date,
etat.utilise_logo,
my_safe_null_str( etat.name_logo ),
etat.is_pixmaps_dir,
diff --git a/src/gsb_reconcile.c b/src/gsb_reconcile.c
index f18871b..9be01d9 100644
--- a/src/gsb_reconcile.c
+++ b/src/gsb_reconcile.c
@@ -419,9 +419,9 @@ gboolean gsb_reconcile_run_reconciliation ( GtkWidget *button,
g_free (string);
g_date_add_months ( date, 1 );
- /* if run.reconcile_end_date or the new date is after today, set today */
+ /* if etat.reconcile_end_date or the new date is after today, set today */
today = gdate_today();
- if ( run.reconcile_end_date || g_date_compare ( date, today) > 0 )
+ if ( etat.reconcile_end_date || g_date_compare ( date, today) > 0 )
{
g_date_free (date);
date = gdate_today();
diff --git a/src/gsb_reconcile_config.c b/src/gsb_reconcile_config.c
index ac9b1b4..91cf4c5 100644
--- a/src/gsb_reconcile_config.c
+++ b/src/gsb_reconcile_config.c
@@ -116,7 +116,7 @@ GtkWidget *gsb_reconcile_config_create ( void )
_("Start Date + one month"),
_("Today's date"),
NULL,
- &run.reconcile_end_date,
+ &etat.reconcile_end_date,
G_CALLBACK ( gsb_reconcile_config_end_date_changed ),
NULL,
GTK_ORIENTATION_HORIZONTAL );
@@ -588,7 +588,7 @@ gboolean gsb_reconcile_config_end_date_changed ( GtkWidget *checkbutton,
GdkEventButton *event,
gpointer data )
{
- run.reconcile_end_date = GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( checkbutton ), "pointer" ) );
+ etat.reconcile_end_date = GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( checkbutton ), "pointer" ) );
gsb_file_set_modified ( TRUE );
diff --git a/src/menu.c b/src/menu.c
index e46fb41..00ee72c 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -842,14 +842,14 @@ gboolean gsb_menu_reinit_largeur_col_menu ( void )
if ( current_page == GSB_ACCOUNT_PAGE )
{
initialise_largeur_colonnes_tab_affichage_ope ( GSB_ACCOUNT_PAGE,
- run.transaction_column_width );
+ etat.transaction_column_width );
gsb_transactions_list_set_largeur_col ( );
}
else if ( current_page == GSB_SCHEDULER_PAGE )
{
initialise_largeur_colonnes_tab_affichage_ope ( GSB_SCHEDULER_PAGE,
- run.scheduler_column_width );
+ etat.scheduler_column_width );
gsb_scheduler_list_set_largeur_col ( );
}
diff --git a/src/structures.h b/src/structures.h
index 9c55153..5e5206d 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -39,6 +39,9 @@ struct gsb_etat_t
gint crypt_file; /* TRUE if we want to crypt the file */
gint fichier_deja_ouvert; /* à un si lors de l'ouverture, le fichier semblait déjà ouvert */
+ /* reconciliation */
+ gint reconcile_end_date; /* Date initiale + 1 mois par défaut */
+
/* formulaire */
gint formulaire_toujours_affiche;
gint affichage_exercice_automatique; /* automatic fyear :0 to set according to the date, 2 according to value date */
@@ -109,6 +112,10 @@ struct gsb_etat_t
gint bet_index_duree;
gdouble bet_frais;
gint bet_type_taux;
+
+ /* largeur des colonnes */
+ gchar *transaction_column_width;
+ gchar *scheduler_column_width;
};
/* declared in parametres.c */
@@ -206,12 +213,7 @@ struct gsb_run_t
gboolean is_saving;
gboolean is_loading;
- /* largeur des colonnes */
- gchar *transaction_column_width;
- gchar *scheduler_column_width;
-
/* reconciliation */
- gint reconcile_end_date; /* Date initiale + 1 mois par défaut */
gint equilibrage;
gint reconcile_account_number; /* Save the last reconciliation try: account */
gchar *reconcile_final_balance; /* final balance amount */
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index ae8463b..e02dafb 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -271,15 +271,15 @@ void init_variables ( void )
for ( i = 0 ; i < SCHEDULER_COL_VISIBLE_COLUMNS ; i++ )
scheduler_col_width[i] = scheduler_col_width_init[i];
- if ( run.transaction_column_width && strlen ( run.transaction_column_width ) )
+ if ( etat.transaction_column_width && strlen ( etat.transaction_column_width ) )
{
- g_free ( run.transaction_column_width );
- run.transaction_column_width = NULL;
+ g_free ( etat.transaction_column_width );
+ etat.transaction_column_width = NULL;
}
- if ( run.scheduler_column_width && strlen ( run.scheduler_column_width ) )
+ if ( etat.scheduler_column_width && strlen ( etat.scheduler_column_width ) )
{
- g_free ( run.scheduler_column_width );
- run.scheduler_column_width = NULL;
+ g_free ( etat.scheduler_column_width );
+ etat.scheduler_column_width = NULL;
}
gsb_gui_navigation_init_tree_view ( );
hooks/post-receive
--
grisbi
More information about the cvs
mailing list