2002-12-13 Sven Neumann <[email protected]>

	* 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

@@ -1,3 +1,10 @@
+2002-12-13  Sven Neumann  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* tools/pdbgen/pdb/image.pdb: added new PDB function

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

libgimp/gimpintl.h

@@ -27,28 +27,20 @@
 #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
 
 #ifndef HAVE_BIND_TEXTDOMAIN_CODESET
 #    define bind_textdomain_codeset(Domain, Codeset) (Domain)
 #endif
 
+
 #endif /* __GIMPINTL_H__ */

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
 

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");
 

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");