From 7d0228fa585fc102f7eeb418fbfbc9c94c06454c Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Sun, 19 Feb 2006 19:28:28 +0000 Subject: [PATCH] Use glib's gi18n.h instead of redefining gettext. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13299 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 3 ++ .../cut-n-paste/foocanvas/foo-canvas-i18n.h | 33 +------------------ 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1503fc5c17..906ff976e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,9 @@ the dialog completes. Fixes #329725. + * lib/goffice-0.0.4/goffice/cut-and-paste/foo-canvas/foo-canvas-i18n.h: + Use glib's gi18n.h instead of redefining gettext. + 2006-02-18 Derek Atkins * intl-scm/xgettext.scm: remove the absolute path from filenames diff --git a/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h b/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h index 662b0ed0fa..5d44314fdb 100644 --- a/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h +++ b/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h @@ -34,37 +34,6 @@ #define __LIBFOO_CANVAS_I18N_H__ #include - -G_BEGIN_DECLS - -#if !defined(__LIBFOO_CANVAS_I18NP_H__) - -#ifdef ENABLE_NLS -# include -# ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN -# undef _ -# define _(String) dgettext (GNOME_EXPLICIT_TRANSLATION_DOMAIN, String) -# else -# define _(String) gettext (String) -# endif -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#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 - -#endif - -G_END_DECLS +#include #endif /* __LIBFOO_CANVAS_I18N_H__ */