[grisbi-cvs] [SCM] grisbi branch, grisbi-gtk3, updated. upstream_version_0_9_4-155-g8cd01f6

[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, grisbi-gtk3 has been updated
       via  8cd01f6c8657b2671ebc1b310a3be17d525f4f2d (commit)
      from  bebec3d63e80f06d9259eeb5b6fcdf90928ed28f (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 8cd01f6c8657b2671ebc1b310a3be17d525f4f2d
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Jan 2 22:08:42 2012 +0100

    upgrade main_mac_osx ()

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

Changes:
diff --git a/src/main.c b/src/main.c
index fe30c24..f3f1bce 100644
--- a/src/main.c
+++ b/src/main.c
@@ -259,38 +259,50 @@ void main_mac_osx ( int argc, char **argv )
     GtkWidget *vbox;
     GtkWidget *menubar;
     GdkPixbuf *pixbuf;
-    cmdline_options  opt;
     gboolean first_use = FALSE;
-    gint status = CMDLINE_SYNTAX_OK;
     GtkOSXApplication *theApp;
 
-    devel_debug ("main_mac_osx");
+    /* Init type system */
+    g_type_init ();
 
-#if IS_DEVELOPMENT_VERSION == 1
-    gsb_grisbi_print_environment_var ( );
-#endif
+    /* initialisation des différents répertoires */
+    gsb_dirs_init ( );
+
+    /* Setup locale/gettext */
+    setlocale ( LC_ALL, "" );
+    bindtextdomain ( PACKAGE, gsb_dirs_get_locale_dir ( ) );
+    bind_textdomain_codeset ( PACKAGE, "UTF-8" );
+    textdomain ( PACKAGE );
+
+    /* Setup command line options */
+    return_value = gsb_main_setup_command_line_options ( argc, argv );
+    if ( return_value )
+        exit ( return_value );
+
+    /* initialisation de la variable locale pour les devises */
+    gsb_locale_init ( );
+
+    /* initialisation du nom du fichier de configuration */
+    gsb_config_initialise_conf_filename ( );
 
-    gtk_init ( &argc, &argv );
+    /* initialisation du mode de débogage */
+    if ( gsb_main_set_debug_level ( ) )
+    {
+        initialize_debugging ( );
+        gsb_grisbi_print_environment_var ( );
+    }
+
+    /* initialisation de gtk. arguments à NULL car traités au dessus */
+    gtk_init ( NULL, NULL );
 
     /* initialisation libgoffice */
     libgoffice_init ( );
-    /* Initialize plugins manager */
+    /* Initialize plugins manager pour goffice */
     go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
 
     /* 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 );
-
-    /* Setup locale/gettext */
-    setlocale (LC_ALL, "");
-    gsb_locale_init ( );
-
     /* on commence par détourner le signal SIGSEGV */
     gsb_grisbi_trappe_signal_sigsegv ( );
 
@@ -333,7 +345,8 @@ void main_mac_osx ( int argc, char **argv )
     dialog_message ( "development-version", VERSION );
 #endif
     
-    gsb_grisbi_load_file_if_necessary ( &opt );
+    /* check the command line, if there is something to open */
+    gsb_main_load_file_if_necessary ( file );
 
     if ( first_use && !nom_fichier_comptes )
         gsb_assistant_first_run ();
@@ -1057,8 +1070,6 @@ void gsb_main_grisbi_shutdown ( void )
 #if GSB_GMEMPROFILE
     g_mem_profile();
 #endif
-
-
 }
 
 


hooks/post-receive
-- 
grisbi