diff --git a/gtk/main.c b/gtk/main.c index 65a7859e9..60c6931ae 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -138,7 +138,7 @@ static GOptionEntry linphone_options[]={ { .long_name = "config", .short_name = '\0', - .arg = G_OPTION_ARG_STRING, + .arg = G_OPTION_ARG_FILENAME, .arg_data = (gpointer) &custom_config_file, .description = N_("Configuration file") }, diff --git a/gtk/propertybox.c b/gtk/propertybox.c index f3179f2c9..a6cee3d48 100644 --- a/gtk/propertybox.c +++ b/gtk/propertybox.c @@ -678,6 +678,8 @@ void linphone_gtk_show_proxy_config(GtkWidget *pb, LinphoneProxyConfig *cfg){ linphone_proxy_config_get_addr(cfg)); tmp=linphone_proxy_config_get_route(cfg); if (tmp) gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"route")),tmp); + tmp=linphone_proxy_config_get_contact_parameters(cfg); + if (tmp) gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"params")),tmp); gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"regperiod")), linphone_proxy_config_get_expires(cfg)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"register")), @@ -710,6 +712,8 @@ void linphone_gtk_proxy_ok(GtkButton *button){ gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"proxy")))); linphone_proxy_config_set_route(cfg, gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"route")))); + linphone_proxy_config_set_contact_parameters(cfg, + gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"params")))); linphone_proxy_config_expires(cfg, (int)gtk_spin_button_get_value( GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"regperiod")))); diff --git a/gtk/sip_account.ui b/gtk/sip_account.ui index 60b751cfa..9c23c806d 100644 --- a/gtk/sip_account.ui +++ b/gtk/sip_account.ui @@ -91,7 +91,7 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 + 5 2 @@ -193,7 +193,7 @@ True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False False adjustment1 @@ -205,6 +205,38 @@ 4 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Contact params: + right + + + 4 + 5 + + + + + 275 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + True + False + False + + + 1 + 2 + 4 + 5 + + + True