gimp r25775 - in trunk: . libgimp plug-ins/pygimp plug-ins/script-fu

[neo svn gnome org]

Author: neo
Date: Fri May 23 13:36:31 2008
New Revision: 25775
URL: http://svn.gnome.org/viewvc/gimp?rev=25775&view=rev

Log:
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.


Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/libgimp/libgimp-intl.h
   trunk/plug-ins/pygimp/pygimp-intl.h
   trunk/plug-ins/script-fu/script-fu-intl.h

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Fri May 23 13:36:31 2008
@@ -17,7 +17,7 @@
 
 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
 

Modified: trunk/libgimp/libgimp-intl.h
==============================================================================
--- trunk/libgimp/libgimp-intl.h	(original)
+++ trunk/libgimp/libgimp-intl.h	Fri May 23 13:36:31 2008
@@ -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)

Modified: trunk/plug-ins/pygimp/pygimp-intl.h
==============================================================================
--- trunk/plug-ins/pygimp/pygimp-intl.h	(original)
+++ trunk/plug-ins/pygimp/pygimp-intl.h	Fri May 23 13:36:31 2008
@@ -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)

Modified: trunk/plug-ins/script-fu/script-fu-intl.h
==============================================================================
--- trunk/plug-ins/script-fu/script-fu-intl.h	(original)
+++ trunk/plug-ins/script-fu/script-fu-intl.h	Fri May 23 13:36:31 2008
@@ -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