[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_3-48-g337e748

[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  337e74805666fe8ec56c84ce54a9886e5efd8d4f (commit)
       via  b38f86e7f31cdfe1b899883514ebe8dc217b6831 (commit)
      from  e5fab0297a2daaf7d977f3c35ae46eb73a0e9890 (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 337e74805666fe8ec56c84ce54a9886e5efd8d4f
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Sep 20 19:25:10 2010 +0200

    fixed a compilation warning

commit b38f86e7f31cdfe1b899883514ebe8dc217b6831
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Sep 19 12:03:26 2010 +0200

    modifications provisoires pour test MacOSX

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

Changes:
diff --git a/src/main.c b/src/main.c
index 6c9f9bb..0b181b8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -135,9 +135,10 @@ int main ( int argc, char **argv )
     setlocale (LC_ALL, "");
 #endif /* !GTKOSXAPPLICATION */
 
-#if IS_DEVELOPMENT_VERSION == 1
-    gsb_grisbi_print_environment_var ( );
-#endif
+/* #if IS_DEVELOPMENT_VERSION == 1
+ *     gsb_grisbi_print_environment_var ( );
+ * #endif
+ */
 
 #ifdef _WIN32
     main_win_32 (  argc, argv );
@@ -171,6 +172,9 @@ void main_linux ( int argc, char **argv )
     gint status = CMDLINE_SYNTAX_OK;
 
     gtk_init ( &argc, &argv );
+#if IS_DEVELOPMENT_VERSION == 1
+    gsb_grisbi_print_environment_var ( );
+#endif
 
     /* on commence par détourner le signal SIGSEGV */
     gsb_grisbi_trappe_signal_sigsegv ( );
@@ -230,6 +234,9 @@ void main_mac_osx ( int argc, char **argv )
     devel_debug ("main_mac_osx");
 
     gtk_init ( &argc, &argv );
+#if IS_DEVELOPMENT_VERSION == 1
+    gsb_grisbi_print_environment_var ( );
+#endif
 
     /* init the app */
     theApp = g_object_new ( GTK_TYPE_OSX_APPLICATION, NULL );
@@ -386,11 +393,14 @@ void main_win_32 (  int argc, char **argv )
 gboolean gsb_grisbi_print_environment_var ( void )
 {
     struct lconv *conv;
+    gchar *tmp_str;
+    gchar *tmp_str_1;
+    gchar *tmp_str_2;
 
     /* test local pour les nombres */
     conv = localeconv();
     
-    printf ("Variables d'environnement :\n\n" );
+/*    printf ("Variables d'environnement :\n\n" );
     printf ("Currency\n"
             "\tcurrency_symbol = %s\n"
             "\tmon_thousands_sep = \"%s\"\n"
@@ -426,6 +436,49 @@ gboolean gsb_grisbi_print_environment_var ( void )
 #endif
             GRISBI_PLUGINS_DIR,
             GRISBI_PIXMAPS_DIR );
+*/
+    tmp_str_1 = g_strdup_printf ("Currency\n"
+            "\tcurrency_symbol = %s\n"
+            "\tmon_thousands_sep = \"%s\"\n"
+            "\tmon_decimal_point = %s\n"
+            "\tpositive_sign = \"%s\"\n"
+            "\tnegative_sign = \"%s\"\n"
+            "\tfrac_digits = \"%d\"\n\n",
+            conv->currency_symbol,
+            g_locale_to_utf8 ( conv->mon_thousands_sep, -1, NULL, NULL, NULL ),
+            g_locale_to_utf8 ( conv->mon_decimal_point, -1, NULL, NULL, NULL ),
+            g_locale_to_utf8 ( conv->positive_sign, -1, NULL, NULL, NULL ),
+            g_locale_to_utf8 ( conv->negative_sign, -1, NULL, NULL, NULL ),
+            conv->frac_digits );
+
+    tmp_str_2 = g_strdup_printf ("Paths\n"
+            "\tC_GRISBIRC = %s\n"
+            "\tC_PATH_CONFIG = %s\n"
+            "\tC_PATH_CONFIG_ACCELS = %s\n"
+            "\tC_PATH_DATA_FILES = %s\n"
+            "\tLOCALEDIR = %s\n"
+            "\tGRISBI_LOCALEDIR = %s\n"
+            "\tGRISBI_PLUGINS_DIR = %s\n"
+            "\tGRISBI_PIXMAPS_DIR = %s\n\n",
+            C_GRISBIRC,
+            C_PATH_CONFIG,
+            C_PATH_CONFIG_ACCELS,
+            C_PATH_DATA_FILES,
+            LOCALEDIR,
+#ifdef GTKOSXAPPLICATION
+            grisbi_osx_get_locale_dir ( ),
+#else
+            GRISBI_LOCALEDIR,
+#endif
+            GRISBI_PLUGINS_DIR,
+            GRISBI_PIXMAPS_DIR );
+
+    tmp_str = g_strconcat (tmp_str_1, "\n\n", tmp_str_2, NULL );
+    dialogue_hint ( tmp_str, "Variables d'environnement :\n\n" );
+
+    g_free ( tmp_str_1 );
+    g_free ( tmp_str_2 );
+    g_free ( tmp_str );
 
     return FALSE;
 }
diff --git a/src/plugins/ofx/ofx.h b/src/plugins/ofx/ofx.h
index 9228b03..7d96a17 100644
--- a/src/plugins/ofx/ofx.h
+++ b/src/plugins/ofx/ofx.h
@@ -32,7 +32,7 @@ G_MODULE_EXPORT extern GSList * ofx_plugin_run ( GtkWidget * assistant,
 #ifndef OFX_ERROR
 #ifdef _MSC_VER
 #undef ERROR
-#endif // _MSC_VER
+#endif /* _MSC_VER */
 #define OFX_ERROR   ERROR
 #endif
 


hooks/post-receive
-- 
grisbi