From 703cbe368077b7b59a46e219129e14eb69403cf3 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Sun, 5 Oct 2008 07:48:23 +0000
Subject: [PATCH] 2.99.5

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@67 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/coreapi/private.h      | 4 +++-
 linphone/gtk-glade/linphone.h   | 8 +++++++-
 linphone/gtk-glade/linphone.iss | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/linphone/coreapi/private.h b/linphone/coreapi/private.h
index 13668e436..1f57ff634 100644
--- a/linphone/coreapi/private.h
+++ b/linphone/coreapi/private.h
@@ -33,7 +33,7 @@
 #endif
 
 #ifndef LINPHONE_VERSION
-#define LINPHONE_VERSION "2.99.4"
+#define LINPHONE_VERSION "2.99.5"
 #endif
 
 #ifndef LIBLINPHONE_VERSION 
@@ -54,8 +54,10 @@
 #define _(String) gettext(String)
 #endif
 #else
+#ifndef _
 #define _(something)	(something)
 #endif
+#endif
 
 void linphone_core_init_media_streams(LinphoneCore *lc);
 
diff --git a/linphone/gtk-glade/linphone.h b/linphone/gtk-glade/linphone.h
index e0ccc8446..a4a3f5f26 100644
--- a/linphone/gtk-glade/linphone.h
+++ b/linphone/gtk-glade/linphone.h
@@ -21,14 +21,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "config.h"
 #else
 #define PACKAGE_DATA_DIR "./"
-#define LINPHONE_VERSION "2.99.4"
+
+#ifndef LINPHONE_VERSION
+#include "private.h" /*from coreapi */
+#endif
+
 #endif
 
 #include <gtk/gtk.h>
 #include "linphonecore.h"
 
 #include <libintl.h>
+#ifndef _
 #define _(String) gettext (String)
+#endif
 
 GdkPixbuf * create_pixbuf(const gchar *filename);
 void add_pixmap_directory(const gchar *directory);
diff --git a/linphone/gtk-glade/linphone.iss b/linphone/gtk-glade/linphone.iss
index 16b49beae..60250b8b2 100755
--- a/linphone/gtk-glade/linphone.iss
+++ b/linphone/gtk-glade/linphone.iss
@@ -3,7 +3,7 @@
 
 [Setup]
 AppName=Linphone
-AppVerName=Linphone for windows 2.99.4 (gtk/glade interface based on liblinphone)
+AppVerName=Linphone for windows 2.99.5 (gtk/glade interface based on liblinphone)
 AppPublisher=linphone.org
 AppPublisherURL=http://www.linphone.org
 AppSupportURL=http://www.linphone.org