[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_99-5-g298a54b

[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  298a54bbb7668f13c517bd54f3d29b9b1f502a8c (commit)
       via  ea0a3deb408d39add063d19c0ed56bc386d20509 (commit)
      from  25a9770ebce7c5b17bd7b6ed6fc9eb9714e988da (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 298a54bbb7668f13c517bd54f3d29b9b1f502a8c
Merge: ea0a3deb408d39add063d19c0ed56bc386d20509 25a9770ebce7c5b17bd7b6ed6fc9eb9714e988da
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Jan 24 21:38:52 2011 +0100

    Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi

commit ea0a3deb408d39add063d19c0ed56bc386d20509
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Jan 24 21:37:08 2011 +0100

    Fixed a compilation bug and minor changes

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

Changes:
diff --git a/src/gsb_file_config.c b/src/gsb_file_config.c
index b23be01..39cfe57 100644
--- a/src/gsb_file_config.c
+++ b/src/gsb_file_config.c
@@ -66,6 +66,9 @@ extern gchar *nom_fichier_comptes;
 extern GtkWidget *window;
 /*END_EXTERN*/
 
+/* global variable, see structures.h */
+struct gsb_conf_t conf;
+
 gint mini_paned_width = 0;
 
 /* contient le nb de derniers fichiers ouverts */
diff --git a/src/main.c b/src/main.c
index 437132e..1dbaa5f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -108,6 +108,8 @@ extern gchar *nom_fichier_comptes;
 extern gchar *titre_fichier;
 /*END_EXTERN*/
 
+/* variables initialisées lors de l'exécution de grisbi */
+struct gsb_run_t run;
 
 /**
  * Main function
diff --git a/src/parametres.c b/src/parametres.c
index 834a7bd..648f1d7 100644
--- a/src/parametres.c
+++ b/src/parametres.c
@@ -97,6 +97,9 @@ static gboolean selectionne_liste_preference ( GtkTreeSelection *selection,
 /*END_STATIC*/
 
 
+/* global "etat" structure shared in the entire program */
+struct gsb_etat_t etat;
+
 GtkWidget *fenetre_preferences = NULL;
 
 static GtkTreeStore *preference_tree_model = NULL;
diff --git a/src/structures.h b/src/structures.h
index 4484e69..bc79df0 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -135,8 +135,9 @@ struct gsb_etat_t
     gint bet_type_taux;
 };
 
+/* declared in parametres.c */
+extern struct gsb_etat_t etat;
 
-struct gsb_etat_t etat;
 
 /** structure conf
  * variables containing just 0 or 1
@@ -207,8 +208,8 @@ struct gsb_conf_t
 
 };
 
-
-struct gsb_conf_t conf;
+/* declared in gsb_file_config.c */
+extern struct gsb_conf_t conf;
 
 /** structure run
  * variables containing just 0 or 1
@@ -224,7 +225,8 @@ struct gsb_run_t
 
 };
 
-struct gsb_run_t run;
+/* declared in main.c */
+extern struct gsb_run_t run;
 
 /* structure définissant une association entre un tiers
  * et une chaine de recherche contenant un ou des jokers (%)
diff --git a/src/tip.c b/src/tip.c
index 6e5295c..0ca6f2e 100644
--- a/src/tip.c
+++ b/src/tip.c
@@ -28,7 +28,6 @@
 #include "tip.h"
 #include "dialog.h"
 #include "gsb_automem.h"
-#include "include.h"
 #include "structures.h"
 #define END_INCLUDE
 
diff --git a/src/utils.c b/src/utils.c
index 150fe59..0197ca6 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -29,10 +29,9 @@
 #include "utils.h"
 #include "dialog.h"
 #include "gsb_data_account.h"
-#include "utils_str.h"
 #include "gsb_file_config.h"
-#include "include.h"
 #include "structures.h"
+#include "utils_str.h"
 #include "erreur.h"
 /*END_INCLUDE*/
 


hooks/post-receive
-- 
grisbi