From 73e717eb3458ce216f152ea4f58ad71ddc8e1d8d Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 23 May 2008 13:36:31 +0000 Subject: [PATCH] require glib-gettextize 2.16. 2008-05-23 Sven Neumann * 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 --- ChangeLog | 11 +++++++++++ autogen.sh | 2 +- libgimp/libgimp-intl.h | 5 +++-- plug-ins/pygimp/pygimp-intl.h | 4 +++- plug-ins/script-fu/script-fu-intl.h | 10 +--------- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 126ff15dfe..500c458ca1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-05-23 Sven Neumann + + * 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 * app/tools/gimppaintoptions-gui.c: left-align the labels in the diff --git a/autogen.sh b/autogen.sh index 33678568fc..58c0b3a1fd 100755 --- a/autogen.sh +++ b/autogen.sh @@ -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 diff --git a/libgimp/libgimp-intl.h b/libgimp/libgimp-intl.h index 39f577a12c..20dae88d30 100644 --- a/libgimp/libgimp-intl.h +++ b/libgimp/libgimp-intl.h @@ -29,8 +29,9 @@ #include -#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) diff --git a/plug-ins/pygimp/pygimp-intl.h b/plug-ins/pygimp/pygimp-intl.h index a78ec60b2a..855e26ed36 100644 --- a/plug-ins/pygimp/pygimp-intl.h +++ b/plug-ins/pygimp/pygimp-intl.h @@ -29,7 +29,9 @@ #include -#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) diff --git a/plug-ins/script-fu/script-fu-intl.h b/plug-ins/script-fu/script-fu-intl.h index 58f09ccf5d..f1184533fd 100644 --- a/plug-ins/script-fu/script-fu-intl.h +++ b/plug-ins/script-fu/script-fu-intl.h @@ -26,17 +26,9 @@ #error "config.h must be included prior to script-fu-intl.h" #endif -#include +#include -#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