From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Sun, 18 Jan 2009 01:08:17 +0000 (+0000)
Subject: If !ENABLE_NLS, make textomain() macro return "messages" in case of a NULL
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=1da8112081679f27f0c96a8972124ee3728bd1c0;p=dana%2Fcg-glib.git

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 76258246..53774b69 100644
--- 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 0186723d..3116f85c 100644
--- 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)