Remove #ifdef ENABLE_NLS

libintl API is guaranteed to always be available, glib will fallback to
proxy-libintl in case gettext is not found.

diff --git a/gdk/gdkintl.h b/gdk/gdkintl.h
index 9dd6bff991773f9fe526f7be75c798f3b287ec29..0202c9544350717e5df5777f2fcae5ec6f41287c 100644 (file)
--- a/gdk/gdkintl.h
+++ b/gdk/gdkintl.h
@@ -19,7 +19,7 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GDKINTL_H__
@@ -27,10 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#ifdef ENABLE_NLS
-#define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String)
-#else
-#define P_(String) (String)
-#endif
+#define P_(String) dgettext (GETTEXT_PACKAGE "-properties", String)
 
 #endif

diff --git a/gtk/gtkintl.h b/gtk/gtkintl.h
index caeb68eb6019a6f9920986a972e5a83b306b8de6..4bf66606b86945faa382f7da0a9a1ab1480658de 100644 (file)
--- a/gtk/gtkintl.h
+++ b/gtk/gtkintl.h
@@ -3,11 +3,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#ifdef ENABLE_NLS
-#define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
-#else 
-#define P_(String) (String)
-#endif
+#define P_(String) g_dgettext (GETTEXT_PACKAGE "-properties", String)
 
 /* not really I18N-related, but also a string marker macro */
 #define I_(string) g_intern_static_string (string)

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index aa329302428d92143a00bcc14fa5e417713c63f4..b268ddbf693c928c2fc824318d3b097615f6c48e 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -505,13 +505,11 @@ gettext_initialization (void)
 {
   setlocale_initialization ();
 
-#ifdef ENABLE_NLS
   bindtextdomain (GETTEXT_PACKAGE, _gtk_get_localedir ());
   bindtextdomain (GETTEXT_PACKAGE "-properties", _gtk_get_localedir ());
-#    ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   bind_textdomain_codeset (GETTEXT_PACKAGE "-properties", "UTF-8");
-#    endif
 #endif
 }
 

diff --git a/tools/encodesymbolic.c b/tools/encodesymbolic.c
index 6f4a44f5737e406c0c9516de9678375645befa11..90887f336557e6c79b42ae1a4825ad1f41beeb92 100644 (file)
--- a/tools/encodesymbolic.c
+++ b/tools/encodesymbolic.c
@@ -59,11 +59,9 @@ main (int argc, char **argv)
 
   setlocale (LC_ALL, "");
 
-#ifdef ENABLE_NLS
   bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR);
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif
 #endif
 
   g_set_prgname ("gtk-encode-symbolic-svg");

diff --git a/tools/gtk-launch.c b/tools/gtk-launch.c
index 9305095ea201dbcfb8e623ef4bd78ba608dfff6e..3ed73dde0f2b1bb7e2f2f66b99f8d0f1089dba39 100644 (file)
--- a/tools/gtk-launch.c
+++ b/tools/gtk-launch.c
@@ -60,12 +60,10 @@ main (int argc, char *argv[])
 
   setlocale (LC_ALL, "");
 
-#ifdef ENABLE_NLS
   bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR);
   textdomain (GETTEXT_PACKAGE);
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif
 #endif
 
   context =

diff --git a/tools/updateiconcache.c b/tools/updateiconcache.c
index 1618a6e40af4532740b366b295fcbf80a1747cc2..a23c96ca1952b3383deb06f27a78f55daed64699 100644 (file)
--- a/tools/updateiconcache.c
+++ b/tools/updateiconcache.c
@@ -1703,11 +1703,9 @@ main (int argc, char **argv)
 
   setlocale (LC_ALL, "");
 
-#ifdef ENABLE_NLS
   bindtextdomain (GETTEXT_PACKAGE, GTK_LOCALEDIR);
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif
 #endif
 
   context = g_option_context_new ("ICONPATH");