[grisbi-cvs] [SCM] grisbi branch, master, updated. ac76dcc70def6d90310dcf0e6b38d3be08237b0f

[Rémi Cardona]

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  ac76dcc70def6d90310dcf0e6b38d3be08237b0f (commit)
      from  572104804c80db978ecdef38019d805ec796125d (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 ac76dcc70def6d90310dcf0e6b38d3be08237b0f
Author: Rémi Cardona <remi at gentoo.org>
Date:   Thu Jul 1 23:27:03 2010 +0200

    Move global variables from headers to .c files, should fix linking issues on OSX
    
    For some unknown reason, GNU ld allowed this code to work, when it should
    have never worked to begin with!
    
    Headers should only contain "extern" variables.

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

Changes:
diff --git a/src/go-optionmenu.c b/src/go-optionmenu.c
index 1527341..e71a633 100644
--- a/src/go-optionmenu.c
+++ b/src/go-optionmenu.c
@@ -162,6 +162,14 @@ enum
   LAST_PROP
 };
 
+static const GOOptionMenuProps default_props = {
+  TRUE,
+  { 7, 13 },
+  { 7, 5, 2, 2 },		/* Left, right, top, bottom */
+  1,
+  0
+};
+
 static GtkButtonClass *parent_class = NULL;
 static guint           signals[LAST_SIGNAL] = { 0 };
 
diff --git a/src/go-optionmenu.h b/src/go-optionmenu.h
index 1c1e4fa..04c1a38 100644
--- a/src/go-optionmenu.h
+++ b/src/go-optionmenu.h
@@ -101,14 +101,6 @@ struct _GOOptionMenuProps
   gint focus_pad;
 };
 
-static const GOOptionMenuProps default_props = {
-  TRUE,
-  { 7, 13 },
-  { 7, 5, 2, 2 },		/* Left, right, top, bottom */
-  1,
-  0
-};
-
 
 /* START_DECLARATION */
 GtkWidget * go_option_menu_get_history (GOOptionMenu *option_menu);
diff --git a/src/gsb_calendar.c b/src/gsb_calendar.c
index 395dbdb..93f3d9b 100644
--- a/src/gsb_calendar.c
+++ b/src/gsb_calendar.c
@@ -43,6 +43,7 @@ static void click_sur_jour_calendrier_echeance ( GtkWidget *calendrier,
 /*END_STATIC*/
 
 
+enum periodicity_units affichage_echeances_perso_j_m_a;
 static GtkWidget *scheduled_calendar;
 gint affichage_echeances;
 gint affichage_echeances_perso_nb_libre;     /* contient le contenu de l'entrée */
diff --git a/src/gsb_calendar.h b/src/gsb_calendar.h
index 28272b1..9b77020 100644
--- a/src/gsb_calendar.h
+++ b/src/gsb_calendar.h
@@ -7,8 +7,9 @@
 /* END_INCLUDE_H */
 
 /* when a global variable contains a definition like here, need to put it with the definition,
- * else mk_include cannot find the .h file... */
-enum periodicity_units affichage_echeances_perso_j_m_a;
+ * else mk_include cannot find the .h file...
+ * Real declaration is in gsb_calendar.c */
+extern enum periodicity_units affichage_echeances_perso_j_m_a;
 
 
 
diff --git a/src/gsb_file_config.c b/src/gsb_file_config.c
index 32e4ce7..e6f9a30 100644
--- a/src/gsb_file_config.c
+++ b/src/gsb_file_config.c
@@ -70,6 +70,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/parametres.c b/src/parametres.c
index 0103524..685ae23 100644
--- a/src/parametres.c
+++ b/src/parametres.c
@@ -87,7 +87,6 @@ static gboolean selectionne_liste_preference ( GtkTreeSelection *selection,
 
 /* global "etat" structure shared in the entire program */
 struct gsb_etat_t etat;
-struct gsb_conf_t conf;
 
 GtkWidget *fenetre_preferences = NULL;
 
diff --git a/src/structures.h b/src/structures.h
index eb12bb3..745f028 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -176,7 +176,7 @@ struct gsb_conf_t
 
 };
 
-/* declared in parametres.c */
+/* declared in gsb_file_config.c */
 extern struct gsb_conf_t conf;
 
 /* structure définissant une association entre un tiers


hooks/post-receive
-- 
grisbi