[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_4-118-gf2acbc2

[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  f2acbc2fe69538c79f3425070ab74f8b06bbe02b (commit)
      from  e60c2d945d5e5db2bba682b807eb5b3ff6dd99bb (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 f2acbc2fe69538c79f3425070ab74f8b06bbe02b
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Jan 1 10:31:04 2012 +0100

    main.c: Fixed a bug introduced by a previous change

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

Changes:
diff --git a/src/main.c b/src/main.c
index 596fd94..a77f18e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -165,6 +165,9 @@ void main_linux ( int argc, char **argv )
     cmdline_options  opt;
     gint status = CMDLINE_SYNTAX_OK;
 
+    /* initialisation des différents répertoires */
+    gsb_dirs_init ( );
+
     bindtextdomain ( PACKAGE, gsb_dirs_get_locale_dir ( ) );
     bind_textdomain_codeset ( PACKAGE, "UTF-8" );
     textdomain ( PACKAGE );
@@ -186,9 +189,6 @@ void main_linux ( int argc, char **argv )
     go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
 #endif /* HAVE_GOFFICE */
 
-    /* initialisation des différents répertoires */
-    gsb_dirs_init ( );
-
     /* on commence par détourner le signal SIGSEGV */
     gsb_grisbi_trappe_signal_sigsegv ( );
 
@@ -274,6 +274,9 @@ void main_mac_osx ( int argc, char **argv )
     /* init the app */
     theApp = g_object_new ( GTK_TYPE_OSX_APPLICATION, NULL );
 
+    /* initialisation des différents répertoires */
+    gsb_dirs_init ( );
+
     bindtextdomain ( PACKAGE,  gsb_dirs_get_locale_dir ( ) );
     bind_textdomain_codeset ( PACKAGE, "UTF-8" );
     textdomain ( PACKAGE );
@@ -282,9 +285,6 @@ void main_mac_osx ( int argc, char **argv )
     setlocale (LC_ALL, "");
     gsb_locale_init ( );
 
-    /* initialisation des différents répertoires */
-    gsb_dirs_init ( );
-
     /* on commence par détourner le signal SIGSEGV */
     gsb_grisbi_trappe_signal_sigsegv ( );
 
@@ -395,6 +395,9 @@ void main_win_32 (  int argc, char **argv )
      /* needed to be able to use the "common" installation of GTK libraries */
     win32_make_sure_the_gtk2_dlls_path_is_in_PATH();
 
+    /* initialisation des différents répertoires */
+    gsb_dirs_init ( );
+
     bindtextdomain ( PACKAGE, gsb_dirs_get_locale_dir ( ) );
     bind_textdomain_codeset ( PACKAGE, "UTF-8" );
     textdomain ( PACKAGE );
@@ -415,9 +418,6 @@ void main_win_32 (  int argc, char **argv )
 
     win32_parse_gtkrc ( "gtkrc" );
 
-    /* initialisation des différents répertoires */
-    gsb_dirs_init ( );
-
     /* parse command line parameter, exit with correct error code when needed */
     if ( !parse_options (argc, argv, &opt, &status ) )
         exit ( status );


hooks/post-receive
-- 
grisbi