[Gnucash-changes] r13299 - gnucash/trunk - Use glib's gi18n.h
instead of redefining gettext.
Derek Atkins
warlord at cvs.gnucash.org
Sun Feb 19 14:28:29 EST 2006
Author: warlord
Date: 2006-02-19 14:28:28 -0500 (Sun, 19 Feb 2006)
New Revision: 13299
Trac: http://svn.gnucash.org/trac/changeset/13299
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h
Log:
Use glib's gi18n.h instead of redefining gettext.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-02-19 18:20:18 UTC (rev 13298)
+++ gnucash/trunk/ChangeLog 2006-02-19 19:28:28 UTC (rev 13299)
@@ -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 <derek at ihtfp.com>
* intl-scm/xgettext.scm: remove the absolute path from filenames
Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h 2006-02-19 18:20:18 UTC (rev 13298)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/cut-n-paste/foocanvas/foo-canvas-i18n.h 2006-02-19 19:28:28 UTC (rev 13299)
@@ -34,37 +34,6 @@
#define __LIBFOO_CANVAS_I18N_H__
#include <glib.h>
+#include <glib/gi18n.h>
-G_BEGIN_DECLS
-
-#if !defined(__LIBFOO_CANVAS_I18NP_H__)
-
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# 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
-
#endif /* __LIBFOO_CANVAS_I18N_H__ */
More information about the gnucash-changes
mailing list