[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_4-117-ge60c2d9
Pierre Biava
nobody at users.sourceforge.net
Sat Dec 31 08:24:24 CET 2011
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 e60c2d945d5e5db2bba682b807eb5b3ff6dd99bb (commit)
via bb81bced340a66638f16be8a623c91e11b50c1f7 (commit)
via a271593cdeeb0918081c7c00550b3c78b121d8c1 (commit)
from ec251309e907f2d4b39e3f438054ab5f1a9c79a5 (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 e60c2d945d5e5db2bba682b807eb5b3ff6dd99bb
Author: pbiava <pierre.biava at nerim.net>
Date: Fri Dec 30 23:32:42 2011 +0100
fixes bug 1432 (cherry picked from commit a1543698521ff056919923ebd7a996542b9d580e)
commit bb81bced340a66638f16be8a623c91e11b50c1f7
Author: pbiava <pierre.biava at nerim.net>
Date: Mon Dec 26 21:45:30 2011 +0100
fixes a crash when the parent window does not exist(cherry picked from commit ad617ba4830bd38a5cfe965c9ea795f1ddcf95b6)
commit a271593cdeeb0918081c7c00550b3c78b121d8c1
Author: pbiava <pierre.biava at nerim.net>
Date: Fri Dec 30 23:20:34 2011 +0100
fixes a segmentation fault when closing Grisbi
-----------------------------------------------------------------------
Changes:
diff --git a/configure.in b/configure.in
index 3e2f35f..9cdc4e3 100644
--- a/configure.in
+++ b/configure.in
@@ -172,9 +172,9 @@ dnl Check for libofx
dnl ================================================================
AC_ARG_WITH(ofx,
- AS_HELP_STRING([--with-ofx],[build grisbi with ofx support (default=auto)]),
+ AS_HELP_STRING([--without-ofx],[build grisbi without ofx support (default=no)]),
[build_ofx=$withval]
- [build_ofx=auto])
+ [build_ofx=no])
PKG_CHECK_MODULES(LIBOFX, [libofx >= 0.7], have_ofx=yes, have_ofx=no)
if test "$build_ofx" = yes -a "$with_ofx" = no; then
@@ -376,7 +376,7 @@ This is an unstable version of grisbi. It is for test purposes only.
Please, DO NOT use it in a production environment. It will probably crash and you will lose your data.
If you are looking for a stable release of grisbi (0.8.x), either download it from:
-http://www.grisbi.org/download.fr.html
+http://sourceforge.net/projects/grisbi/files/grisbi%20stable/
Thanks,
The grisbi team
diff --git a/src/dialog.c b/src/dialog.c
index 7d6c563..5c791d6 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -229,13 +229,22 @@ GtkWidget *dialogue_special_no_run ( GtkMessageType param,
{
GtkWidget *dialog;
- dialog = gtk_message_dialog_new ( GTK_WINDOW ( run.window ),
- GTK_DIALOG_DESTROY_WITH_PARENT,
+ if ( GTK_IS_WINDOW ( run.window ) )
+ {
+ dialog = gtk_message_dialog_new ( GTK_WINDOW ( run.window ),
+ GTK_DIALOG_DESTROY_WITH_PARENT || GTK_DIALOG_MODAL,
param, buttons,
"%s", text );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog)->label ), text );
+ }
+ else
+ {
+ dialog = gtk_message_dialog_new ( NULL,
+ 0,
+ param, buttons,
+ "%s", text );
+ }
- gtk_window_set_modal ( GTK_WINDOW ( dialog ), TRUE );
+ gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog)->label ), text );
return dialog;
}
diff --git a/src/main.c b/src/main.c
index d7f25db..596fd94 100644
--- a/src/main.c
+++ b/src/main.c
@@ -138,8 +138,6 @@ int main ( int argc, char **argv )
g_mem_set_vtable(glib_mem_profiler_table);
#endif
- gsb_dirs_init ( );
-
#ifdef _WIN32
main_win_32 ( argc, argv );
#else
@@ -149,17 +147,6 @@ int main ( int argc, char **argv )
main_linux ( argc, argv );
#endif /* GTKOSXAPPLICATION || linux */
#endif /* _WIN32 */
- gsb_locale_shutdown ( );
- gsb_dirs_shutdown ( );
-
-#ifdef HAVE_GOFFICE
- /* liberation libgoffice */
- libgoffice_shutdown ( );
-#endif /* HAVE_GOFFICE */
-
-#if GSB_GMEMPROFILE
- g_mem_profile();
-#endif
exit ( 0 );
}
@@ -184,7 +171,6 @@ void main_linux ( int argc, char **argv )
/* Setup locale/gettext */
setlocale (LC_ALL, "");
-
gsb_locale_init ( );
#if IS_DEVELOPMENT_VERSION == 1
@@ -200,6 +186,9 @@ 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 ( );
@@ -232,6 +221,21 @@ void main_linux ( int argc, char **argv )
/* sauvegarde les raccourcis claviers */
gtk_accel_map_save ( C_PATH_CONFIG_ACCELS ( ) );
+
+ /* libération de mémoire */
+ gsb_locale_shutdown ( );
+ gsb_dirs_shutdown ( );
+
+#ifdef HAVE_GOFFICE
+ /* liberation libgoffice */
+ libgoffice_shutdown ( );
+#endif /* HAVE_GOFFICE */
+
+#if GSB_GMEMPROFILE
+ g_mem_profile();
+#endif
+
+ exit ( 0 );
}
@@ -276,9 +280,11 @@ void main_mac_osx ( int argc, char **argv )
/* Setup locale/gettext */
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 ( );
@@ -347,6 +353,20 @@ void main_mac_osx ( int argc, char **argv )
g_object_unref ( theApp );
+ gsb_locale_shutdown ( );
+ gsb_dirs_shutdown ( );
+
+#ifdef HAVE_GOFFICE
+ /* liberation libgoffice */
+ libgoffice_shutdown ( );
+#endif /* HAVE_GOFFICE */
+
+#if GSB_GMEMPROFILE
+ g_mem_profile();
+#endif
+
+ exit ( 0 );
+
#endif /* GTKOSXAPPLICATION */
}
@@ -395,6 +415,9 @@ 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 );
@@ -425,6 +448,20 @@ void main_win_32 ( int argc, char **argv )
/* sauvegarde les raccourcis claviers */
gtk_accel_map_save ( C_PATH_CONFIG_ACCELS ( ) );
+ gsb_locale_shutdown ( );
+ gsb_dirs_shutdown ( );
+
+#ifdef HAVE_GOFFICE
+ /* liberation libgoffice */
+ libgoffice_shutdown ( );
+#endif /* HAVE_GOFFICE */
+
+#if GSB_GMEMPROFILE
+ g_mem_profile();
+#endif
+
+ exit ( 0 );
+
#endif /* WIN_32 */
}
hooks/post-receive
--
grisbi
More information about the cvs
mailing list