If !ENABLE_NLS, make textomain() macro return "messages" in case of a NULL

        * glib/glibintl.h: If !ENABLE_NLS, make textomain() macro
        return "messages" in case of a NULL argument. Patch by
        Peter Kjellerstedt.

svn path=/trunk/; revision=7812

diff --git a/ChangeLog b/ChangeLog
index 762582462c436f169c5ea586091974860d92047a..53774b690627cc3d9a076d1f708075688b0f5bc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 567977 – textdomain() macro should not return NULL when 
+       ENABLE_NLS is not set
+
+       * glib/glibintl.h: If !ENABLE_NLS, make textomain() macro 
+       return "messages" in case of a NULL argument. Patch by
+       Peter Kjellerstedt.
+
 2009-01-17  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 567838 – G_STRUCT_OFFSETOF fails to compile under icc 9.1

diff --git a/glib/glibintl.h b/glib/glibintl.h
index 0186723d98cf3e9e0e8e67dd87f3fae1e6f44d07..3116f85c18c607f9fd3ffb23c21271f46cd0ed50 100644 (file)
--- a/glib/glibintl.h
+++ b/glib/glibintl.h
@@ -23,7 +23,7 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str);
 #define _(String) (String)
 #define N_(String) (String)
 #define P_(String) (String)
-#define textdomain(String) (String)
+#define textdomain(String) ((String) ? (String) : "messages")
 #define gettext(String) (String)
 #define dgettext(Domain,String) (String)
 #define dcgettext(Domain,String,Type) (String)