[Pkg-privacy-commits] [pidgin-otr] 168/255: Compile correctly even if i18n (libintl/gettext) is not available.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit b08967abef8ea9cb8c938560b539896960cd21de
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Thu Sep 6 15:23:12 2012 -0400

    Compile correctly even if i18n (libintl/gettext) is not available.
    
    configure checks for the availability of i18n, but if it's not there,
    we weren't doing anything sensible.  Now, we just use the English
    constant text strings in the code by defining _(x) and N_(x) to be just
    (x).
---
 ChangeLog    | 8 ++++++++
 gtk-dialog.c | 3 +++
 gtk-ui.c     | 3 +++
 otr-plugin.c | 5 +++++
 ui.c         | 3 +++
 5 files changed, 22 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d32958e..74fad13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-06
+
+	* gtk-dialog.c:
+	* gtk-ui.c:
+	* ui.c:
+	* otr-plugin.c: Compile correctly even if i18n (libintl/gettext)
+	is not available.
+
 2012-09-04
 
 	* README: Release 4.0.0
diff --git a/gtk-dialog.c b/gtk-dialog.c
index 725c78c..f9af2da 100644
--- a/gtk-dialog.c
+++ b/gtk-dialog.c
@@ -48,6 +48,9 @@
 #ifdef ENABLE_NLS
 /* internationalisation headers */
 #include <glib/gi18n-lib.h>
+#else
+#define _(x) (x)
+#define N_(x) (x)
 #endif
 
 /* libotr headers */
diff --git a/gtk-ui.c b/gtk-ui.c
index 80261e7..00c337f 100644
--- a/gtk-ui.c
+++ b/gtk-ui.c
@@ -42,6 +42,9 @@
 #ifdef ENABLE_NLS
 /* internationalisation header */
 #include <glib/gi18n-lib.h>
+#else
+#define _(x) (x)
+#define N_(x) (x)
 #endif
 
 /* purple-otr headers */
diff --git a/otr-plugin.c b/otr-plugin.c
index bec8dd0..d455ca8 100644
--- a/otr-plugin.c
+++ b/otr-plugin.c
@@ -56,6 +56,11 @@
 /* internationalisation header */
 #include <glib/gi18n-lib.h>
 
+#else /* ENABLE_NLS */
+
+#define _(x) (x)
+#define N_(x) (x)
+
 #endif /* ENABLE_NLS */
 
 /* libotr headers */
diff --git a/ui.c b/ui.c
index d47ab1e..2885e99 100644
--- a/ui.c
+++ b/ui.c
@@ -34,6 +34,9 @@
 #ifdef ENABLE_NLS
 /* internationalisation header */
 #include <glib/gi18n-lib.h>
+#else
+#define _(x) (x)
+#define N_(x) (x)
 #endif
 
 /* libotr headers */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git