Commit ff51072d authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor
Browse files

Optimize for size rather than speed by making _() always call

Tue Jan 16 23:20:38 2001  Owen Taylor  <otaylor@redhat.com>

	* gutils.c glibintl.h: Optimize for size rather than speed by
	making _() always call _glib_gettext() instead of conditionally
	calling gettext() or _glib_gettext_init. glib only uses translated
	strings in slow error handling code anyways.

	* glibintl.h: g'ify types.

	* Makefile.am: include glibintl.h in _SOURCES
parent a9d05d4c
Tue Jan 16 23:20:38 2001 Owen Taylor <otaylor@redhat.com>
* gutils.c glibintl.h: Optimize for size rather than speed by
making _() always call _glib_gettext() instead of conditionally
calling gettext() or _glib_gettext_init. glib only uses translated
strings in slow error handling code anyways.
* glibintl.h: g'ify types.
* Makefile.am: include glibintl.h in _SOURCES
2001-01-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE.
......
Tue Jan 16 23:20:38 2001 Owen Taylor <otaylor@redhat.com>
* gutils.c glibintl.h: Optimize for size rather than speed by
making _() always call _glib_gettext() instead of conditionally
calling gettext() or _glib_gettext_init. glib only uses translated
strings in slow error handling code anyways.
* glibintl.h: g'ify types.
* Makefile.am: include glibintl.h in _SOURCES
2001-01-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE.
......
Tue Jan 16 23:20:38 2001 Owen Taylor <otaylor@redhat.com>
* gutils.c glibintl.h: Optimize for size rather than speed by
making _() always call _glib_gettext() instead of conditionally
calling gettext() or _glib_gettext_init. glib only uses translated
strings in slow error handling code anyways.
* glibintl.h: g'ify types.
* Makefile.am: include glibintl.h in _SOURCES
2001-01-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE.
......
Tue Jan 16 23:20:38 2001 Owen Taylor <otaylor@redhat.com>
* gutils.c glibintl.h: Optimize for size rather than speed by
making _() always call _glib_gettext() instead of conditionally
calling gettext() or _glib_gettext_init. glib only uses translated
strings in slow error handling code anyways.
* glibintl.h: g'ify types.
* Makefile.am: include glibintl.h in _SOURCES
2001-01-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE.
......
Tue Jan 16 23:20:38 2001 Owen Taylor <otaylor@redhat.com>
* gutils.c glibintl.h: Optimize for size rather than speed by
making _() always call _glib_gettext() instead of conditionally
calling gettext() or _glib_gettext_init. glib only uses translated
strings in slow error handling code anyways.
* glibintl.h: g'ify types.
* Makefile.am: include glibintl.h in _SOURCES
2001-01-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE.
......
Tue Jan 16 23:20:38 2001 Owen Taylor <otaylor@redhat.com>
* gutils.c glibintl.h: Optimize for size rather than speed by
making _() always call _glib_gettext() instead of conditionally
calling gettext() or _glib_gettext_init. glib only uses translated
strings in slow error handling code anyways.
* glibintl.h: g'ify types.
* Makefile.am: include glibintl.h in _SOURCES
2001-01-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE.
......
Tue Jan 16 23:20:38 2001 Owen Taylor <otaylor@redhat.com>
* gutils.c glibintl.h: Optimize for size rather than speed by
making _() always call _glib_gettext() instead of conditionally
calling gettext() or _glib_gettext_init. glib only uses translated
strings in slow error handling code anyways.
* glibintl.h: g'ify types.
* Makefile.am: include glibintl.h in _SOURCES
2001-01-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE.
......
Tue Jan 16 23:20:38 2001 Owen Taylor <otaylor@redhat.com>
* gutils.c glibintl.h: Optimize for size rather than speed by
making _() always call _glib_gettext() instead of conditionally
calling gettext() or _glib_gettext_init. glib only uses translated
strings in slow error handling code anyways.
* glibintl.h: g'ify types.
* Makefile.am: include glibintl.h in _SOURCES
2001-01-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32.in: Define ENABLE_NLS and GETTEXT_PACKAGE.
......
......@@ -58,6 +58,7 @@ libglib_1_3_la_SOURCES = \
ghook.c \
giochannel.c \
giounix.c \
glibintl.h \
glist.c \
gmain.c \
gmarkup.c \
......
......@@ -58,6 +58,7 @@ libglib_1_3_la_SOURCES = \
ghook.c \
giochannel.c \
giounix.c \
glibintl.h \
glist.c \
gmain.c \
gmarkup.c \
......
......@@ -5,15 +5,10 @@
#ifdef ENABLE_NLS
extern int _glib_gettext_initialized;
gchar *_glib_gettext (const gchar *str);
char *_glib_gettext_init (const char *str);
#include<libintl.h>
#define _(String) \
(_glib_gettext_initialized ? \
dgettext(GETTEXT_PACKAGE,String) : \
_glib_gettext_init(String))
#include <libintl.h>
#define _(String) _glib_gettext(String)
#ifdef gettext_noop
#define N_(String) gettext_noop(String)
......
......@@ -1006,20 +1006,27 @@ g_get_codeset (void)
#include <libintl.h>
#ifdef G_OS_WIN32
#define GLIB_LOCALE_DIR \
#define GLIB_LOCALE_DIR \
g_strconcat (g_win32_get_package_installation_directory (GETTEXT_PACKAGE), \
G_DIR_SEPARATOR_S, \
"locale", \
NULL)
#endif
int _glib_gettext_initialized = 0;
#endif /* G_OS_WIN32 */
char *_glib_gettext_init (const char *str)
gchar *
_glib_gettext (const gchar *str)
{
bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
gboolean _glib_gettext_initialized = FALSE;
if (!_glib_gettext_initialized)
{
bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
_glib_gettext_initialized = TRUE;
}
return dgettext (GETTEXT_PACKAGE, str);
}
......
......@@ -5,15 +5,10 @@
#ifdef ENABLE_NLS
extern int _glib_gettext_initialized;
gchar *_glib_gettext (const gchar *str);
char *_glib_gettext_init (const char *str);
#include<libintl.h>
#define _(String) \
(_glib_gettext_initialized ? \
dgettext(GETTEXT_PACKAGE,String) : \
_glib_gettext_init(String))
#include <libintl.h>
#define _(String) _glib_gettext(String)
#ifdef gettext_noop
#define N_(String) gettext_noop(String)
......
......@@ -1006,20 +1006,27 @@ g_get_codeset (void)
#include <libintl.h>
#ifdef G_OS_WIN32
#define GLIB_LOCALE_DIR \
#define GLIB_LOCALE_DIR \
g_strconcat (g_win32_get_package_installation_directory (GETTEXT_PACKAGE), \
G_DIR_SEPARATOR_S, \
"locale", \
NULL)
#endif
int _glib_gettext_initialized = 0;
#endif /* G_OS_WIN32 */
char *_glib_gettext_init (const char *str)
gchar *
_glib_gettext (const gchar *str)
{
bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
gboolean _glib_gettext_initialized = FALSE;
if (!_glib_gettext_initialized)
{
bindtextdomain(GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
_glib_gettext_initialized = TRUE;
}
return dgettext (GETTEXT_PACKAGE, str);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment