From d6bccae005f0ffe55f1fc0687b74dfb91909c76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 8 Jul 2016 13:41:57 +0200
Subject: [PATCH] Ask the user to restart Linphone after setting the remote
 provisioning URI on Windows

---
 gtk/config-fetching.c | 30 ++++++++++++++++++++++++------
 gtk/config-uri.ui     |  6 ++----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/gtk/config-fetching.c b/gtk/config-fetching.c
index b1794eea9..88f433da6 100644
--- a/gtk/config-fetching.c
+++ b/gtk/config-fetching.c
@@ -36,12 +36,30 @@ void linphone_gtk_config_uri_changed(GtkWidget *button){
 	
 	if (uri && (strlen(uri)==0 || strcmp(uri,"https://")==0)) uri=NULL;
 	
-	linphone_core_set_provisioning_uri(linphone_gtk_get_core(),uri);
-	gtk_widget_destroy(w);
-	
-	if (uri){
-		linphone_gtk_schedule_restart();
-		gtk_main_quit();
+	if(linphone_core_set_provisioning_uri(linphone_gtk_get_core(),uri) == 0) {
+		gtk_widget_destroy(w);
+		if (uri){
+#ifndef _WIN32
+			linphone_gtk_schedule_restart();
+			gtk_main_quit();
+#else
+			GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(linphone_gtk_get_main_window()),
+													   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+													   GTK_MESSAGE_INFO,
+													   GTK_BUTTONS_OK,
+													   _("Remote provisioning URI successfully set. Please restart Linphone in order to load the new remote settings"));
+			g_signal_connect_swapped(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), dialog);
+			gtk_widget_show(dialog);
+#endif
+		}
+	} else {
+		GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(w),
+								   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+								   GTK_MESSAGE_INFO,
+								   GTK_BUTTONS_OK,
+								   _("Invalid remote provisioning URI"));
+		g_signal_connect_swapped(G_OBJECT(dialog), "response", G_CALLBACK(gtk_widget_destroy), dialog);
+		gtk_widget_show(dialog);
 	}
 }
 
diff --git a/gtk/config-uri.ui b/gtk/config-uri.ui
index cc99c40db..26c1fef0e 100644
--- a/gtk/config-uri.ui
+++ b/gtk/config-uri.ui
@@ -19,11 +19,10 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="label">gtk-undo</property>
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="linphone_gtk_config_uri_cancel" swapped="no"/>
               </object>
@@ -39,7 +38,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="linphone_gtk_config_uri_changed" swapped="no"/>
               </object>
@@ -77,7 +75,7 @@ Please enter or modify the configuration URI below. After clicking OK, Linphone
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="invisible_char">•</property>
-            <property name="text" translatable="no">https://</property>
+            <property name="text">https://</property>
             <property name="primary_icon_activatable">False</property>
             <property name="secondary_icon_activatable">False</property>
             <property name="primary_icon_sensitive">True</property>