From dcc650db2180e8910b9dea71f7fd8c8d34489f2c Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 6 Aug 2015 16:34:46 +0200 Subject: [PATCH] setupwizard.c: refresh the accounts list in settings when closing the assistant --- gtk/linphone.h | 1 + gtk/setupwizard.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gtk/linphone.h b/gtk/linphone.h index 90f9e81a7..0193a8510 100644 --- a/gtk/linphone.h +++ b/gtk/linphone.h @@ -308,6 +308,7 @@ LINPHONE_PUBLIC void linphone_gtk_video_preset_changed(GtkWidget *w); LINPHONE_PUBLIC void linphone_gtk_show_camera_preview_clicked(GtkButton *button); LINPHONE_PUBLIC void linphone_gtk_update_my_contact(GtkWidget *w); LINPHONE_PUBLIC void linphone_gtk_add_proxy(GtkButton *button); +LINPHONE_PUBLIC void linphone_gtk_show_sip_accounts(GtkWidget *w); LINPHONE_PUBLIC void linphone_gtk_edit_proxy(GtkButton *button); LINPHONE_PUBLIC void linphone_gtk_remove_proxy(GtkButton *button); LINPHONE_PUBLIC void linphone_gtk_clear_passwords(GtkWidget *button); diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c index 5d393fbde..5c8d21ee9 100644 --- a/gtk/setupwizard.c +++ b/gtk/setupwizard.c @@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include - static const int PASSWORD_MIN_SIZE = 6; static const int LOGIN_MIN_SIZE = 4; static GtkWidget *the_assistant = NULL; @@ -622,14 +621,23 @@ void linphone_gtk_show_assistant(GtkWidget *parent) { g_signal_connect(G_OBJECT(w), "close", (GCallback)linphone_gtk_assistant_closed, NULL); g_signal_connect(G_OBJECT(w), "cancel", (GCallback)linphone_gtk_assistant_closed, NULL); g_signal_connect(G_OBJECT(w), "prepare", (GCallback)linphone_gtk_assistant_prepare, NULL); - + gtk_window_set_transient_for(GTK_WINDOW(the_assistant), GTK_WINDOW(linphone_gtk_get_main_window())); gtk_widget_show(w); } void linphone_gtk_close_assistant(void) { - if (the_assistant == NULL) return; + GtkWidget *mw; + if (the_assistant == NULL) { + return; + } gtk_widget_destroy(the_assistant); the_assistant = NULL; + + //reload list of proxy configs because a new one was probably created... + mw=linphone_gtk_get_main_window(); + if (mw) { + linphone_gtk_show_sip_accounts((GtkWidget*)g_object_get_data(G_OBJECT(mw),"parameters")); + } }