[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9.0-109-g8a98d75

[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  8a98d7563377c19bc4b0bbc6a1a3888d9b44028e (commit)
       via  015ab47aebd7a1e98bc47b6729f501c278f667d7 (commit)
      from  73237ced8f160aac109f6bf8a381ecebe8a69515 (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 8a98d7563377c19bc4b0bbc6a1a3888d9b44028e
Author: Rémi Cardona <remi at gentoo.org>
Date:   Sun Mar 27 00:06:35 2011 +0100

    Use gsb_menu_get_ui_manager() instead of using global variable 'ui_manager'

commit 015ab47aebd7a1e98bc47b6729f501c278f667d7
Author: Rémi Cardona <remi at gentoo.org>
Date:   Wed Mar 23 08:46:14 2011 +0100

    Declare 'iso_13616_ibans' as static as it's only used within gsb_account_property.c

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

Changes:
diff --git a/src/barre_outils.c b/src/barre_outils.c
index 76f20b4..2db4255 100644
--- a/src/barre_outils.c
+++ b/src/barre_outils.c
@@ -79,7 +79,6 @@ GtkWidget *menu_import_rules;
 /*START_EXTERN*/
 extern GtkWidget *barre_outils;
 extern gboolean block_menu_cb;
-extern GtkUIManager * ui_manager;
 /*END_EXTERN*/
 
 
@@ -319,6 +318,7 @@ gboolean popup_transaction_rules_menu ( GtkWidget * button,
 /****************************************************************************************************/
 gboolean change_aspect_liste ( gint demande )
 {
+    GtkUIManager *ui_manager = gsb_menu_get_ui_manager ( );
     switch ( demande )
     {
 	case 0:
diff --git a/src/erreur.c b/src/erreur.c
index 082073f..0ac58e4 100644
--- a/src/erreur.c
+++ b/src/erreur.c
@@ -45,6 +45,7 @@
 #include "main.h"
 #include "utils.h"
 #include "utils_str.h"
+#include "menu.h"
 /*END_INCLUDE*/
 
 #ifdef HAVE_BACKTRACE
@@ -59,7 +60,6 @@ static GtkWidget * print_backtrace ( void );
 
 /*START_EXTERN*/
 extern gchar *nom_fichier_comptes;
-extern GtkUIManager * ui_manager;
 /*END_EXTERN*/
 
 static gint debugging_grisbi;
@@ -488,6 +488,7 @@ gboolean gsb_debug_start_log ( void )
     {
         GtkWidget *widget;
         gchar *tmp_str_2;
+        GtkUIManager *ui_manager = gsb_menu_get_ui_manager ( );
 
         widget = gtk_ui_manager_get_widget ( ui_manager, "/menubar/FileMenu/DebugMode" );
         etat.debug_mode = TRUE;
diff --git a/src/gsb_account_property.c b/src/gsb_account_property.c
index 5bd7356..21e6295 100644
--- a/src/gsb_account_property.c
+++ b/src/gsb_account_property.c
@@ -115,7 +115,7 @@ struct iso_13616_iban
     gint nbre_char;
 };
 
-struct iso_13616_iban iso_13616_ibans [] = {
+static struct iso_13616_iban iso_13616_ibans [] = {
     { "XX", "XXkk XXXX XXXX XXXX XXXX XXXX XXXX XXXX XX", 34 },
     { "AD", "ADkk BBBB SSSS CCCC CCCC CCCC", 24 },
     { "AT", "ATkk BBBB BCCC CCCC CCCC", 20 },
diff --git a/src/gsb_reconcile.c b/src/gsb_reconcile.c
index c613e15..579c701 100644
--- a/src/gsb_reconcile.c
+++ b/src/gsb_reconcile.c
@@ -58,6 +58,7 @@
 #include "transaction_list.h"
 #include "transaction_list_sort.h"
 #include "structures.h"
+#include "menu.h"
 /*END_INCLUDE*/
 
 /*START_STATIC*/
@@ -77,7 +78,6 @@ extern GtkWidget *label_last_statement;
 extern gint mise_a_jour_liste_comptes_accueil;
 extern GtkWidget * navigation_tree_view;
 extern GtkWidget * reconcile_panel;
-extern GtkUIManager * ui_manager;
 /*END_EXTERN*/
 
 
@@ -667,6 +667,7 @@ gboolean gsb_reconcile_finish_reconciliation ( GtkWidget *button,
  * */
 void gsb_reconcile_sensitive ( gboolean sensitive )
 {
+    GtkUIManager *ui_manager = gsb_menu_get_ui_manager ( );
     gtk_widget_set_sensitive ( navigation_tree_view, sensitive );
     gsb_gui_sensitive_headings (sensitive);
     /* add by pbiava 02/11/2009 */
diff --git a/src/menu.c b/src/menu.c
index 6ad1be3..0e0a588 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -84,7 +84,7 @@ extern GtkWidget *window;
 
 
 gboolean block_menu_cb = FALSE;
-GtkUIManager *ui_manager;
+static GtkUIManager *ui_manager;
 static gint merge_id = -1;
 static gint recent_files_merge_id = -1;
 static gint move_to_account_merge_id = -1;


hooks/post-receive
-- 
grisbi