luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 09:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Plug small one-time leak on Windows. (#488068, Daniel Atallah)

Browse Source 
2007-10-22  Tor Lillqvist  <tml@novell.com>

	* glib/gutils.c (_glib_gettext): Plug small one-time leak on
	Windows. (#488068, Daniel Atallah)


svn path=/trunk/; revision=5795
This commit is contained in:
Tor Lillqvist 2007-10-22 20:13:55 +00:00 committed by Tor Lillqvist
parent 397705e95c
commit 43c16432fc
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-10-22 Tor Lillqvist <tml@novell.com>
* glib/gutils.c (_glib_gettext): Plug small one-time leak on
Windows. (#488068, Daniel Atallah)
2007-10-21 Behdad Esfahbod <behdad@gnome.org> 2007-10-21 Behdad Esfahbod <behdad@gnome.org>
* glib/gdate.c (g_date_strftime): * glib/gdate.c (g_date_strftime):

9
glib/gutils.c
View File

@ -3143,7 +3143,7 @@ _g_utils_thread_init (void)
* use system codepage as bindtextdomain() doesn't have a UTF-8 * use system codepage as bindtextdomain() doesn't have a UTF-8
* interface. * interface.
*/ */
static const gchar * static gchar *
_glib_get_locale_dir (void) _glib_get_locale_dir (void)
{ {
gchar *dir, *cp_dir; gchar *dir, *cp_dir;
@ -3170,7 +3170,6 @@ _glib_get_locale_dir (void)
} }
#undef GLIB_LOCALE_DIR #undef GLIB_LOCALE_DIR
#define GLIB_LOCALE_DIR _glib_get_locale_dir ()
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
@ -3181,7 +3180,13 @@ _glib_gettext (const gchar *str)
if (!_glib_gettext_initialized) if (!_glib_gettext_initialized)
{ {
#ifdef G_OS_WIN32
gchar *tmp = _glib_get_locale_dir();
bindtextdomain(GETTEXT_PACKAGE, tmp);
g_free(tmp);
#else
bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR); bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
#endif
# ifdef HAVE_BIND_TEXTDOMAIN_CODESET # ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
# endif # endif