[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_4-32-g7e4ecf7

[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  7e4ecf79d4ababf86c259b5fbf935cc7ee742ca6 (commit)
      from  27c4987b6d1c2ffbec164d8f1e23012f7524971f (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 7e4ecf79d4ababf86c259b5fbf935cc7ee742ca6
Author: pbiava <pierre.biava at nerim.net>
Date:   Tue Sep 27 21:42:28 2011 +0200

    Adding Goffice for Windows

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

Changes:
diff --git a/src/main.c b/src/main.c
index 74a0d3e..9539c8d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -152,6 +152,11 @@ int main ( int argc, char **argv )
     gsb_locale_shutdown ( );
     gsb_dirs_shutdown ( );
 
+#ifdef HAVE_GOFFICE
+    /* liberation libgoffice */
+    libgoffice_shutdown ( );
+#endif
+
 #if GSB_GMEMPROFILE
     g_mem_profile();
 #endif
@@ -191,8 +196,8 @@ void main_linux ( int argc, char **argv )
 #ifdef HAVE_GOFFICE
     /* initialisation libgoffice */
     libgoffice_init ( );
-	/* Initialize plugins manager */
-	go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+    /* Initialize plugins manager */
+    go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
 #endif
 
     /* on commence par détourner le signal SIGSEGV */
@@ -227,11 +232,6 @@ void main_linux ( int argc, char **argv )
 
     /* sauvegarde les raccourcis claviers */
     gtk_accel_map_save ( C_PATH_CONFIG_ACCELS ( ) );
-
-#ifdef HAVE_GOFFICE
-    /* liberation libgoffice */
-    libgoffice_shutdown ( );
-#endif
 }
 
 
@@ -263,8 +263,8 @@ void main_mac_osx ( int argc, char **argv )
 #ifdef HAVE_GOFFICE
     /* initialisation libgoffice */
     libgoffice_init ( );
-	/* Initialize plugins manager */
-	go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+    /* Initialize plugins manager */
+    go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
 #endif
 
     /* init the app */
@@ -347,11 +347,6 @@ void main_mac_osx ( int argc, char **argv )
 
     g_object_unref ( theApp );
 
-#ifdef HAVE_GOFFICE
-    /* liberation libgoffice */
-    libgoffice_shutdown ( );
-#endif
-
 #endif /* GTKOSXAPPLICATION */
 }
 
@@ -389,6 +384,13 @@ void main_win_32 (  int argc, char **argv )
 
     gsb_locale_init ( );
 
+#ifdef HAVE_GOFFICE
+    /* initialisation libgoffice */
+    libgoffice_init ( );
+    /* Initialize plugins manager */
+    go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+#endif
+
     gtk_init ( &argc, &argv );
 
     win32_parse_gtkrc ( "gtkrc" );


hooks/post-receive
-- 
grisbi