IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Call gbr_init() only on ENABLE_BINRELOC, #450991. Move variables into #ifdef'ed blocks.

Browse Source 
Also fix the leaking of a GError if gbr_init failed.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16213 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler 2007-06-25 22:22:15 +00:00
parent dcfda18f7c
commit f84f1855e2
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/bin/gnucash-bin.c
View File

@ -559,27 +559,32 @@ gnc_log_init()
int
main(int argc, char ** argv)
{
gchar *localedir;
GError *binreloc_error = NULL;
#if !defined(G_THREADS_ENABLED) || defined(G_THREADS_IMPL_NONE)
# error "No GLib thread implementation available!"
#endif
g_thread_init(NULL);
/* Init binreloc */
if (!gbr_init (&binreloc_error) ) {
printf("main: Error on gbr_init: %s\n", binreloc_error->message);
#ifdef ENABLE_BINRELOC
{
GError *binreloc_error = NULL;
if (!gbr_init(&binreloc_error)) {
g_print("main: Error on gbr_init: %s\n", binreloc_error->message);
g_error_free(binreloc_error);
}
}
#endif
#ifdef HAVE_GETTEXT
{
gchar *localedir = gnc_path_get_localedir();
/* setlocale(LC_ALL, ""); is already called by gtk_set_locale()
via gtk_init(). */
bindtextdomain(GETTEXT_PACKAGE, localedir);
textdomain(GETTEXT_PACKAGE);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
g_free(localedir);
}
localedir = gnc_path_get_localedir ();
#ifdef HAVE_GETTEXT
/* setlocale (LC_ALL, ""); is already called by gtk_set_locale()
via gtk_init(). */
bindtextdomain (GETTEXT_PACKAGE, localedir);
textdomain (GETTEXT_PACKAGE);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
g_free (localedir);
qof_log_init();
qof_log_set_default(QOF_LOG_INFO);