[beast/win32] Defining _DOMAIN collides with system header, so use a new namespaced name.
- From: Stefan Westerfeld <stw src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [beast/win32] Defining _DOMAIN collides with system header, so use a new namespaced name.
- Date: Sat, 5 Sep 2009 10:08:16 +0000 (UTC)
commit 41466bcf6e29cbfb98fe16e1205acac8d8f509f7
Author: Stefan Westerfeld <stefan space twc de>
Date: Sat Sep 5 10:07:59 2009 +0200
Defining _DOMAIN collides with system header, so use a new namespaced name.
Based os 012_seq_waiter_and_domain.diff.
beast-gtk/bstdefs.h | 4 ++--
beast-gtk/bstusermessage.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/beast-gtk/bstdefs.h b/beast-gtk/bstdefs.h
index 065e277..083c53e 100644
--- a/beast-gtk/bstdefs.h
+++ b/beast-gtk/bstdefs.h
@@ -89,8 +89,8 @@ typedef enum /*< skip >*/
/* --- i18n and gettext helpers --- */
-#define _DOMAIN (NULL)
-#define _(str) dgettext (_DOMAIN, str)
+#define BEAST_GETTEXT_DOMAIN (NULL)
+#define _(str) dgettext (BEAST_GETTEXT_DOMAIN, str)
#define N_(str) (str)
diff --git a/beast-gtk/bstusermessage.c b/beast-gtk/bstusermessage.c
index 9628171..810b6ed 100644
--- a/beast-gtk/bstusermessage.c
+++ b/beast-gtk/bstusermessage.c
@@ -364,7 +364,7 @@ repeat_dialog (GxkDialog *dialog)
if (label)
{
gint count = g_object_get_int (dialog, "BEAST-user-message-count");
- gchar *rstr = g_strdup_printf (dngettext (_DOMAIN, _("Message has been repeated %u time"), _("Message has been repeated %u times"), count), count);
+ gchar *rstr = g_strdup_printf (dngettext (BEAST_GETTEXT_DOMAIN, _("Message has been repeated %u time"), _("Message has been repeated %u times"), count), count);
g_object_set_int (dialog, "BEAST-user-message-count", count + 1);
gtk_label_set_text (label, rstr);
g_free (rstr);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]