dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimp/gimpintl.h libgimp/libgimp-intl.h removed remaining usage of 

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.
This commit is contained in:
Sven Neumann 2002-12-13 13:23:47 +00:00 committed by Sven Neumann
parent 8183459c44
commit 12890477ef
6 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2002-12-13 Sven Neumann <sven@gimp.org>
* tools/pdbgen/pdb/image.pdb: added new PDB function * tools/pdbgen/pdb/image.pdb: added new PDB function

2
devel-docs/libgimpmodule/.cvsignore
View File

@ -2,6 +2,8 @@ Makefile
Makefile.in Makefile.in
libgimpmodule.args libgimpmodule.args
libgimpmodule.hierarchy libgimpmodule.hierarchy
libgimpmodule.interfaces
libgimpmodule.prerequisites
libgimpmodule.signals libgimpmodule.signals
libgimpmodule-decl.txt libgimpmodule-decl.txt
libgimpmodule-decl-list.txt libgimpmodule-decl-list.txt

22
libgimp/gimpintl.h
View File

@ -27,23 +27,14 @@
#endif #endif
#include <locale.h> #include <locale.h>
#include <libintl.h>
#ifdef ENABLE_NLS
# include <libintl.h> #define _(String) gettext (String)
# define _(String) gettext (String)
# ifdef gettext_noop #ifdef gettext_noop
# define N_(String) gettext_noop (String) # define N_(String) gettext_noop (String)
# else
# define N_(String) (String)
# endif
#else #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) # define N_(String) (String)
#endif #endif
@ -51,4 +42,5 @@
# define bind_textdomain_codeset(Domain, Codeset) (Domain) # define bind_textdomain_codeset(Domain, Codeset) (Domain)
#endif #endif
#endif /* __GIMPINTL_H__ */ #endif /* __GIMPINTL_H__ */

23
libgimp/libgimp-intl.h
View File

@ -26,20 +26,17 @@
#error "config.h must be included prior to libgimp-intl.h" #error "config.h must be included prior to libgimp-intl.h"
#endif #endif
#ifdef ENABLE_NLS #include <libintl.h>
# include <libintl.h>
# define _(String) dgettext ("gimp14-libgimp", String)
# undef gettext #define _(String) dgettext ("gimp14-libgimp", String)
# define gettext(String) dgettext ("gimp14-libgimp", String)
# ifdef gettext_noop #undef gettext
# define N_(String) gettext_noop (String) #define gettext(String) dgettext ("gimp14-libgimp", String)
# else
# define N_(String) (String) #ifdef gettext_noop
# endif # define N_(String) gettext_noop (String)
#else #else
/* Stubs that do something close enough. */
# define gettext(String) (String)
# define _(String) (String)
# define N_(String) (String) # define N_(String) (String)
#endif #endif

6
plug-ins/script-fu/script-fu-interface.c
View File

@ -219,7 +219,7 @@ static void script_fu_brush_preview (gchar *name,
* Local variables * Local variables
*/ */
static GTree *script_list = NULL; static GTree *script_list = NULL;
static SFInterface *sf_interface = NULL; /* there can only be at most one static SFInterface *sf_interface = NULL; /* there can only be at most one
interactive interface */ interactive interface */
@ -252,11 +252,7 @@ script_fu_find_scripts (void)
g_tree_destroy (script_list); g_tree_destroy (script_list);
} }
#ifdef ENABLE_NLS
script_list = g_tree_new ((GCompareFunc) strcoll); script_list = g_tree_new ((GCompareFunc) strcoll);
#else
script_list = g_tree_new ((GCompareFunc) strcmp);
#endif
path_str = gimp_gimprc_query ("script-fu-path"); path_str = gimp_gimprc_query ("script-fu-path");

6
plug-ins/script-fu/script-fu-scripts.c
View File

@ -219,7 +219,7 @@ static void script_fu_brush_preview (gchar *name,
* Local variables * Local variables
*/ */
static GTree *script_list = NULL; static GTree *script_list = NULL;
static SFInterface *sf_interface = NULL; /* there can only be at most one static SFInterface *sf_interface = NULL; /* there can only be at most one
interactive interface */ interactive interface */
@ -252,11 +252,7 @@ script_fu_find_scripts (void)
g_tree_destroy (script_list); g_tree_destroy (script_list);
} }
#ifdef ENABLE_NLS
script_list = g_tree_new ((GCompareFunc) strcoll); script_list = g_tree_new ((GCompareFunc) strcoll);
#else
script_list = g_tree_new ((GCompareFunc) strcmp);
#endif
path_str = gimp_gimprc_query ("script-fu-path"); path_str = gimp_gimprc_query ("script-fu-path");