[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_3-52-gcaf38a7
Pierre Biava
nobody at users.sourceforge.net
Wed Sep 22 20:20:18 CEST 2010
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 caf38a7186d04dc7a4636907542350c0f279e16a (commit)
via 828c152e085d87b767c4a239812e346238ce5429 (commit)
via b562a09d2928b3709546b8970a95351b181f7cee (commit)
from 33fbb0fa238e4996ed96705e4e5b7f431ab59c10 (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 caf38a7186d04dc7a4636907542350c0f279e16a
Merge: 828c152e085d87b767c4a239812e346238ce5429 33fbb0fa238e4996ed96705e4e5b7f431ab59c10
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Sep 22 20:17:43 2010 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 828c152e085d87b767c4a239812e346238ce5429
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Sep 22 20:16:16 2010 +0200
minor change in grisbi.spec
commit b562a09d2928b3709546b8970a95351b181f7cee
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Sep 22 20:10:14 2010 +0200
retour sur l'affichage des variables d'environnement
-----------------------------------------------------------------------
Changes:
diff --git a/grisbi.spec b/grisbi.spec
index 7390002..7c3349d 100644
--- a/grisbi.spec
+++ b/grisbi.spec
@@ -78,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Sep 12 2010 Pierre Biava <grisbi at pierre.biava.name> 0.7.4-1mdv2010.1
-- new version 0.6.0
+- new version 0.7.4
* Sun Apr 18 2010 Pierre Biava <grisbi at pierre.biava.name> 0.6.0-1mdv2010.0
- new version 0.6.0
diff --git a/src/main.c b/src/main.c
index 0b181b8..27bde95 100644
--- a/src/main.c
+++ b/src/main.c
@@ -125,9 +125,7 @@ int main ( int argc, char **argv )
#endif
#ifndef GTKOSXAPPLICATION
- #define GRISBI_LOCALEDIR LOCALEDIR
-
- bindtextdomain ( PACKAGE, GRISBI_LOCALEDIR );
+ bindtextdomain ( PACKAGE, LOCALEDIR );
bind_textdomain_codeset ( PACKAGE, "UTF-8" );
textdomain ( PACKAGE );
@@ -135,10 +133,9 @@ 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 );
@@ -172,9 +169,6 @@ 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 ( );
@@ -234,9 +228,6 @@ 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 );
@@ -393,14 +384,11 @@ 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"
@@ -420,7 +408,6 @@ gboolean gsb_grisbi_print_environment_var ( void )
"\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",
@@ -428,58 +415,14 @@ gboolean gsb_grisbi_print_environment_var ( void )
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_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;
}
hooks/post-receive
--
grisbi
More information about the cvs
mailing list