From da81b5f81613a0626397f519d1c2cd80cbbd1c5a Mon Sep 17 00:00:00 2001
From: Stefan Becker <chemobejk@gmail.com>
Date: Wed, 21 Mar 2012 19:56:41 +0200
Subject: [PATCH] nls: fix build when NLS is disabled

Noticed while trying to get the code compiled on FreeBSD9.0.
---
 src/api/sipe-nls.h    | 4 +++-
 src/core/sipe-conf.c  | 4 ++--
 src/core/sipe-media.c | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/api/sipe-nls.h b/src/api/sipe-nls.h
index f074bd33..5f773541 100644
--- a/src/api/sipe-nls.h
+++ b/src/api/sipe-nls.h
@@ -3,7 +3,7 @@
  *
  * pidgin-sipe
  *
- * Copyright (C) 2009 SIPE Project <http://sipe.sourceforge.net/>
+ * Copyright (C) 2009-12 SIPE Project <http://sipe.sourceforge.net/>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,4 +25,6 @@
 #else
 #define _(String) ((const char *) (String))
 #define N_(String) ((const char *) (String))
+#define gettext(String) ((const char *) (String))
+#define dngettext(package, StringS, StringP, p) ((const char *) ((p) ? (StringP) : (StringS)))
 #endif /* ENABLE_NLS */
diff --git a/src/core/sipe-conf.c b/src/core/sipe-conf.c
index 556da4d4..c0783913 100644
--- a/src/core/sipe-conf.c
+++ b/src/core/sipe-conf.c
@@ -3,7 +3,7 @@
  *
  * pidgin-sipe
  *
- * Copyright (C) 2010-11 SIPE Project <http://sipe.sourceforge.net/>
+ * Copyright (C) 2010-12 SIPE Project <http://sipe.sourceforge.net/>
  * Copyright (C) 2009 pier11 <pier11@operamail.com>
  *
  *
@@ -836,7 +836,7 @@ ask_accept_voice_conference(struct sipe_core_private *sipe_private,
 	gchar **parts;
 	gchar *alias;
 	gchar *ask_msg;
-	gchar *novv_note;
+	const gchar *novv_note;
 	struct conf_accept_ctx *ctx;
 
 #ifdef HAVE_VV
diff --git a/src/core/sipe-media.c b/src/core/sipe-media.c
index 96b63bd6..fbebad8a 100644
--- a/src/core/sipe-media.c
+++ b/src/core/sipe-media.c
@@ -3,7 +3,7 @@
  *
  * pidgin-sipe
  *
- * Copyright (C) 2011 SIPE Project <http://sipe.sourceforge.net/>
+ * Copyright (C) 2011-12 SIPE Project <http://sipe.sourceforge.net/>
  * Copyright (C) 2010 Jakub Adam <jakub.adam@ktknet.cz>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <glib.h>
 
@@ -1030,7 +1031,7 @@ process_invite_call_response(struct sipe_core_private *sipe_private,
 
 	if (msg->response >= 400) {
 		// Call rejected by remote peer or an error occurred
-		gchar *title;
+		const gchar *title;
 		GString *desc = g_string_new("");
 		gboolean append_responsestr = FALSE;
 
-- 
2.11.4.GIT