GtkEntry: Sanity check the end_pos value in _get_display_text()

[~andy/gtk] / gtk / gtkintl.h

diff --git a/gtk/gtkintl.h b/gtk/gtkintl.h
index 9f66ec1e7fd613410d7a3f00bcad080ecd9f0b84..caeb68eb6019a6f9920986a972e5a83b306b8de6 100644 (file)
--- a/gtk/gtkintl.h
+++ b/gtk/gtkintl.h
@@ -1,29 +1,15 @@
 #ifndef __GTKINTL_H__
 #define __GTKINTL_H__
 
-#include "config.h"
-#include <glib.h>
+#include <glib/gi18n-lib.h>
 
 #ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext(GETTEXT_PACKAGE,String)
-#define P_(String) dgettext(GETTEXT_PACKAGE "-properties",String)
-#define Q_(String) g_strip_context ((String), gettext (String))
-#ifdef gettext_noop
-#define N_(String) gettext_noop(String)
-#else
-#define N_(String) (String)
-#endif
-#else /* NLS is disabled */
-#define _(String) (String)
+#define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+#else 
 #define P_(String) (String)
-#define N_(String) (String)
-#define Q_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain) 
 #endif
 
+/* not really I18N-related, but also a string marker macro */
+#define I_(string) g_intern_static_string (string)
+
 #endif