From 5845738837420b476d759960a2ca48f4ec3dc195 Mon Sep 17 00:00:00 2001
From: neo <neo@f57ce169-c725-0410-9505-c4955b3f21d2>
Date: Fri, 13 Dec 2002 13:23:47 +0000
Subject: [PATCH] 2002-12-13  Sven Neumann  <sven@gimp.org>

	* libgimp/gimpintl.h
	* libgimp/libgimp-intl.h
	* plug-ins/script-fu/script-fu-scripts.c: removed remaining usage
	of ENABLE_NLS.


git-svn-id: http://svn.gnome.org/svn/gimp/trunk@8385 f57ce169-c725-0410-9505-c4955b3f21d2
---
 ChangeLog                                |  7 +++++++
 devel-docs/libgimpmodule/.cvsignore      |  2 ++
 libgimp/gimpintl.h                       | 22 +++++++---------------
 libgimp/libgimp-intl.h                   | 23 ++++++++++-------------
 plug-ins/script-fu/script-fu-interface.c |  6 +-----
 plug-ins/script-fu/script-fu-scripts.c   |  6 +-----
 6 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1e805e3dc0..ecca9f6ac4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-13  Sven Neumann  <sven@gimp.org>
+
+	* libgimp/gimpintl.h
+	* libgimp/libgimp-intl.h
+	* plug-ins/script-fu/script-fu-scripts.c: removed remaining usage
+	of ENABLE_NLS.
+
 2002-12-13  Sven Neumann  <sven@gimp.org>
 
 	* tools/pdbgen/pdb/image.pdb: added new PDB function
diff --git a/devel-docs/libgimpmodule/.cvsignore b/devel-docs/libgimpmodule/.cvsignore
index 4130bde65b..21f1c093fe 100644
--- a/devel-docs/libgimpmodule/.cvsignore
+++ b/devel-docs/libgimpmodule/.cvsignore
@@ -2,6 +2,8 @@ Makefile
 Makefile.in
 libgimpmodule.args
 libgimpmodule.hierarchy
+libgimpmodule.interfaces
+libgimpmodule.prerequisites
 libgimpmodule.signals
 libgimpmodule-decl.txt
 libgimpmodule-decl-list.txt
diff --git a/libgimp/gimpintl.h b/libgimp/gimpintl.h
index 4f767b3059..f72277d875 100644
--- a/libgimp/gimpintl.h
+++ b/libgimp/gimpintl.h
@@ -27,23 +27,14 @@
 #endif
 
 #include <locale.h>
+#include <libintl.h>
 
-#ifdef ENABLE_NLS
-#    include <libintl.h>
-#    define _(String) gettext (String)
-#    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
-#    else
-#        define N_(String) (String)
-#    endif
+
+#define _(String) gettext (String)
+
+#ifdef gettext_noop
+#    define N_(String) gettext_noop (String)
 #else
-/* Stubs that do something close enough.  */
-#    define textdomain(String) (String)
-#    define gettext(String) (String)
-#    define dgettext(Domain,Message) (Message)
-#    define dcgettext(Domain,Message,Type) (Message)
-#    define bindtextdomain(Domain,Directory) (Domain)
-#    define _(String) (String)
 #    define N_(String) (String)
 #endif
 
@@ -51,4 +42,5 @@
 #    define bind_textdomain_codeset(Domain, Codeset) (Domain)
 #endif
 
+
 #endif /* __GIMPINTL_H__ */
diff --git a/libgimp/libgimp-intl.h b/libgimp/libgimp-intl.h
index 4dda235427..fe75f3e155 100644
--- a/libgimp/libgimp-intl.h
+++ b/libgimp/libgimp-intl.h
@@ -26,20 +26,17 @@
 #error "config.h must be included prior to libgimp-intl.h"
 #endif
 
-#ifdef ENABLE_NLS
-#    include <libintl.h>
-#    define _(String) dgettext ("gimp14-libgimp", String)
-#    undef gettext
-#    define gettext(String) dgettext ("gimp14-libgimp", String)
-#    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
-#    else
-#        define N_(String) (String)
-#    endif
+#include <libintl.h>
+
+
+#define _(String) dgettext ("gimp14-libgimp", String)
+
+#undef gettext
+#define gettext(String) dgettext ("gimp14-libgimp", String)
+
+#ifdef gettext_noop
+#    define N_(String) gettext_noop (String)
 #else
-/* Stubs that do something close enough.  */
-#    define gettext(String) (String)
-#    define _(String) (String)
 #    define N_(String) (String)
 #endif
 
diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c
index 135c81d4f2..c306f0a86d 100644
--- a/plug-ins/script-fu/script-fu-interface.c
+++ b/plug-ins/script-fu/script-fu-interface.c
@@ -219,7 +219,7 @@ static void       script_fu_brush_preview           (gchar     *name,
  *  Local variables
  */
 
-static GTree       *script_list = NULL;
+static GTree       *script_list  = NULL;
 static SFInterface *sf_interface = NULL;  /*  there can only be at most one
 					      interactive interface  */
 					      
@@ -252,11 +252,7 @@ script_fu_find_scripts (void)
       g_tree_destroy (script_list);
     }
 
-#ifdef ENABLE_NLS
   script_list = g_tree_new ((GCompareFunc) strcoll);
-#else
-  script_list = g_tree_new ((GCompareFunc) strcmp);
-#endif
 
   path_str = gimp_gimprc_query ("script-fu-path");
 
diff --git a/plug-ins/script-fu/script-fu-scripts.c b/plug-ins/script-fu/script-fu-scripts.c
index 135c81d4f2..c306f0a86d 100644
--- a/plug-ins/script-fu/script-fu-scripts.c
+++ b/plug-ins/script-fu/script-fu-scripts.c
@@ -219,7 +219,7 @@ static void       script_fu_brush_preview           (gchar     *name,
  *  Local variables
  */
 
-static GTree       *script_list = NULL;
+static GTree       *script_list  = NULL;
 static SFInterface *sf_interface = NULL;  /*  there can only be at most one
 					      interactive interface  */
 					      
@@ -252,11 +252,7 @@ script_fu_find_scripts (void)
       g_tree_destroy (script_list);
     }
 
-#ifdef ENABLE_NLS
   script_list = g_tree_new ((GCompareFunc) strcoll);
-#else
-  script_list = g_tree_new ((GCompareFunc) strcmp);
-#endif
 
   path_str = gimp_gimprc_query ("script-fu-path");