witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Ask the user to restart Linphone after setting the remote provisioning URI on Windows

Browse source
This commit is contained in:
François Grisez 2016-07-08 13:41:57 +02:00
parent ec2ff4e8fd
commit d6bccae005
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gtk/config-fetching.c
View file

@ -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);
}
}

6
gtk/config-uri.ui
View file

@ -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>