Commit 73e717eb authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

require glib-gettextize 2.16.

2008-05-23  Sven Neumann  <sven@gimp.org>

	* autogen.sh (GLIB_REQUIRED_VERSION): require glib-gettextize 2.16.

	* libgimp/libgimp-intl.h
	* plug-ins/pygimp/pygimp-intl.h: synced with gi18n-lib.h from glib
	2.16. This adds support for the C_() macro.

	* plug-ins/script-fu/script-fu-intl.h: just include gi18n.h instead
	of duplicating things from this header.

svn path=/trunk/; revision=25775
parent e5667f73
2008-05-23 Sven Neumann <sven@gimp.org>
* autogen.sh (GLIB_REQUIRED_VERSION): require glib-gettextize 2.16.
* libgimp/libgimp-intl.h
* plug-ins/pygimp/pygimp-intl.h: synced with gi18n-lib.h from glib
2.16. This adds support for the C_() macro.
* plug-ins/script-fu/script-fu-intl.h: just include gi18n.h instead
of duplicating things from this header.
2008-05-23 Michael Natterer <mitch@gimp.org>
* app/tools/gimppaintoptions-gui.c: left-align the labels in the
......
......@@ -17,7 +17,7 @@ LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
AUTOCONF_REQUIRED_VERSION=2.54
AUTOMAKE_REQUIRED_VERSION=1.9.6
GLIB_REQUIRED_VERSION=2.10.0
GLIB_REQUIRED_VERSION=2.16.0
INTLTOOL_REQUIRED_VERSION=0.31
LIBTOOL_REQUIRED_VERSION=1.5
......
......@@ -29,8 +29,9 @@
#include <libintl.h>
#define _(String) dgettext (GETTEXT_PACKAGE "-libgimp", String)
#define Q_(String) g_strip_context ((String), dgettext (GETTEXT_PACKAGE "-libgimp", String))
#define _(String) dgettext (GETTEXT_PACKAGE "-libgimp", String)
#define Q_(String) g_dpgettext (GETTEXT_PACKAGE "-libgimp", String, 0)
#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE "-libgimp", Context "\004" String, strlen (Context) + 1)
#undef gettext
#define gettext(String) dgettext (GETTEXT_PACKAGE "-libgimp", String)
......
......@@ -29,7 +29,9 @@
#include <libintl.h>
#define _(String) dgettext (GETTEXT_PACKAGE "-python", String)
#define _(String) dgettext (GETTEXT_PACKAGE "-python", String)
#define Q_(String) g_dpgettext (GETTEXT_PACKAGE "-python", String, 0)
#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE "-python", Context "\004" String, strlen (Context) + 1)
#undef gettext
#define gettext(String) dgettext (GETTEXT_PACKAGE "-python", String)
......
......@@ -26,17 +26,9 @@
#error "config.h must be included prior to script-fu-intl.h"
#endif
#include <libintl.h>
#include <glib/gi18n.h>
#define _(String) gettext (String)
#ifdef gettext_noop
# define N_(String) gettext_noop (String)
#else
# define N_(String) (String)
#endif
#ifndef HAVE_BIND_TEXTDOMAIN_CODESET
# define bind_textdomain_codeset(Domain, Codeset) (Domain)
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment