X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fglibintl.h;h=4f2e58b80e3e1a35a8ed335611feb4853466329f;hb=2a53b4d0e2c98a14aedf31e38f0ad1fb2e8fe26f;hp=a21017039294bb353c14c31eb67f3021a3b7ccdb;hpb=b8796462fbed70f55219da6c3c8f6611de8f2a8c;p=platform%2Fupstream%2Fglib.git

diff --git a/glib/glibintl.h b/glib/glibintl.h
index a210170..4f2e58b 100644
--- a/glib/glibintl.h
+++ b/glib/glibintl.h
@@ -1,19 +1,23 @@
 #ifndef __GLIBINTL_H__
 #define __GLIBINTL_H__
 
-#include "config.h"
-
-#ifdef ENABLE_NLS
+#ifndef SIZEOF_CHAR
+#error "config.h must be included prior to glibintl.h"
+#endif
 
-extern int _glib_gettext_initialized;
+GLIB_AVAILABLE_IN_ALL
+const gchar * glib_gettext  (const gchar *str) G_GNUC_FORMAT(1);
+GLIB_AVAILABLE_IN_ALL
+const gchar * glib_pgettext (const gchar *msgctxtid,
+                             gsize        msgidoffset) G_GNUC_FORMAT(1);
 
-char *_glib_gettext_init (const char *str);
+#ifdef ENABLE_NLS
 
-#include<libintl.h>
-#define _(String)                         \
-   (_glib_gettext_initialized ?            \
-      dgettext(GETTEXT_PACKAGE,String) :  \
-      _glib_gettext_init(String))
+#include <libintl.h>
+#define _(String) glib_gettext(String)
+/* Split out this in the code, but keep it in the same domain for now */
+#define P_(String) glib_gettext(String)
+#define C_(Context,String) glib_pgettext (Context "\004" String, strlen (Context) + 1)
 
 #ifdef gettext_noop
 #define N_(String) gettext_noop(String)
@@ -23,11 +27,18 @@ char *_glib_gettext_init (const char *str);
 #else /* NLS is disabled */
 #define _(String) (String)
 #define N_(String) (String)
-#define textdomain(String) (String)
+#define P_(String) (String)
+#define C_(Context,String) (String)
+#define textdomain(String) ((String) ? (String) : "messages")
 #define gettext(String) (String)
 #define dgettext(Domain,String) (String)
 #define dcgettext(Domain,String,Type) (String)
+#define dngettext(Domain,String1,String2,N) ((N) == 1 ? (String1) : (String2))
 #define bindtextdomain(Domain,Directory) (Domain) 
+#define bind_textdomain_codeset(Domain,Codeset)
 #endif
 
+/* not really I18N-related, but also a string marker macro */
+#define I_(string) g_intern_static_string (string)
+
 #endif /* __GLIBINTL_H__ */