From 44cdea0cfdfb24a0c9fa60cabb7961dda3e82b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 26 Jun 2015 11:30:07 +0200
Subject: [PATCH] Fix language selection on Windows and MacOSX

---
 gtk/propertybox.c | 14 ++------------
 gtk/support.c     | 21 ++-------------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index e0565dcdc..07d610986 100644
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -1200,12 +1200,7 @@ static void linphone_gtk_fill_langs(GtkWidget *pb){
 	int i=0,index=0;
 	int cur_lang_index=-1;
 	char text[256]={0};
-	const char *cur_lang;
-	#if defined(WIN32) || defined(__APPLE__)
-		cur_lang=getenv("LANG");
-	#else
-		cur_lang=getenv("LANGUAGE");
-	#endif
+	const char *cur_lang = g_getenv("LANGUAGE");
 	if (cur_lang==NULL) cur_lang="C";
 	/* glade creates a combo box without list model and text renderer,
 	unless we fill it with a dummy text.
@@ -1227,12 +1222,7 @@ static void linphone_gtk_fill_langs(GtkWidget *pb){
 void linphone_gtk_lang_changed(GtkComboBox *combo){
 	const char *selected=gtk_combo_box_get_active_text(combo);
 	char code[10];
-	const char *cur_lang;
-	#if defined(WIN32) || defined(__APPLE__)
-		cur_lang=getenv("LANG");
-	#else
-		cur_lang=getenv("LANGUAGE");
-	#endif
+	const char *cur_lang=g_getenv("LANGUAGE");
 	if (selected!=NULL){
 		sscanf(selected,"%s",code);
 		if (cur_lang==NULL) cur_lang="C";
diff --git a/gtk/support.c b/gtk/support.c
index 615ac6562..ebb61c33d 100644
--- a/gtk/support.c
+++ b/gtk/support.c
@@ -155,30 +155,13 @@ const char *linphone_gtk_get_lang(const char *config_file){
 
 void linphone_gtk_set_lang(const char *code){
 	LpConfig *cfg=linphone_core_get_config(linphone_gtk_get_core());
-	const char *curlang;
-
-	#ifdef WIN32
-	char tmp[128];
-	#endif
-
-	#if defined(WIN32) || defined(__APPLE__)
-		curlang=getenv("LANG");
-	#else
-		curlang=getenv("LANGUAGE");
-	#endif
+	const char *curlang=g_getenv("LANGUAGE");
 	if (curlang!=NULL && strncmp(curlang,code,2)==0) {
 		/* do not loose the _territory@encoding part*/
 		return;
 	}
 	lp_config_set_string(cfg,"GtkUi","lang",code);
-#ifdef WIN32
-	snprintf(tmp,sizeof(tmp),"LANG=%s",code);
-	_putenv(tmp);
-#elif __APPLE__
-	setenv("LANG",code,1);
-#else
-	setenv("LANGUAGE",code,1);
-#endif
+	g_setenv("LANGUAGE",code,1);
 }
 
 const gchar *linphone_gtk_get_ui_config(const char *key, const char *def){