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

diff --git a/ChangeLog b/ChangeLog
index 88e7bf1..9798c5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 88e7bf1..9798c5e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+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.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 88e7bf1..9798c5e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+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.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 88e7bf1..9798c5e 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,14 @@
+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.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 88e7bf1..9798c5e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+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.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 88e7bf1..9798c5e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+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.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 88e7bf1..9798c5e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+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.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 88e7bf1..9798c5e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+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.

diff --git a/Makefile.am b/Makefile.am
index fbd8d83..6976062 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,7 @@ libglib_1_3_la_SOURCES =      \
        ghook.c                 \
        giochannel.c            \
        giounix.c               \
+       glibintl.h              \
        glist.c                 \
        gmain.c                 \
        gmarkup.c               \

diff --git a/glib/Makefile.am b/glib/Makefile.am
index fbd8d83..6976062 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -58,6 +58,7 @@ libglib_1_3_la_SOURCES =      \
        ghook.c                 \
        giochannel.c            \
        giounix.c               \
+       glibintl.h              \
        glist.c                 \
        gmain.c                 \
        gmarkup.c               \

diff --git a/glib/glibintl.h b/glib/glibintl.h
index a210170..c7a1b6a 100644 (file)
--- a/glib/glibintl.h
+++ b/glib/glibintl.h
@@ -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)

diff --git a/glib/gutils.c b/glib/gutils.c
index b16e31a..221cc19 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -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);
 }

diff --git a/glibintl.h b/glibintl.h
index a210170..c7a1b6a 100644 (file)
--- a/glibintl.h
+++ b/glibintl.h
@@ -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)

diff --git a/gutils.c b/gutils.c
index b16e31a..221cc19 100644 (file)
--- a/gutils.c
+++ b/gutils.c
@@ -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);
 }