Remove the ENABLE_NLS check here as well.

Mon Jul 12 00:02:40 2004  Matthias Clasen  <maclas@gmx.de>

	* glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well.

diff --git a/ChangeLog b/ChangeLog
index 7f192b2..282c60b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 12 00:02:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well.
+
 2004-07-09  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gdir.c (g_dir_open): Convert filename to UTF-8 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7f192b2..282c60b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Mon Jul 12 00:02:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well.
+
 2004-07-09  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gdir.c (g_dir_open): Convert filename to UTF-8 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 7f192b2..282c60b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Mon Jul 12 00:02:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well.
+
 2004-07-09  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gdir.c (g_dir_open): Convert filename to UTF-8 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7f192b2..282c60b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Mon Jul 12 00:02:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well.
+
 2004-07-09  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gdir.c (g_dir_open): Convert filename to UTF-8 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7f192b2..282c60b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Mon Jul 12 00:02:40 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well.
+
 2004-07-09  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gdir.c (g_dir_open): Convert filename to UTF-8 

diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h
index dc1a620..48e9fa2 100644 (file)
--- a/glib/gi18n-lib.h
+++ b/glib/gi18n-lib.h
@@ -21,8 +21,6 @@
 
 #include <glib/gstrfuncs.h>
 
-#ifdef ENABLE_NLS
-
 #include <libintl.h>
 
 #ifndef GETTEXT_PACKAGE
@@ -37,19 +35,6 @@
 #define N_(String) (String)
 #endif
 
-#else /* NLS is disabled */
-
-#define _(String) (String)
-#define Q_(String) (String)
-#define N_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain) 
-
-#endif
-
 #endif  /* __G_I18N_LIB_H__ */