From f326ffa70d971d5e8d34353b0c9bdf953db8a387 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Mon, 21 Sep 2009 12:03:56 +0000
Subject: [PATCH] display in use adsl/fiber choice at startup
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@669 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
linphone/gtk-glade/loginframe.c | 14 +++++++++-----
linphone/gtk-glade/main.glade | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/linphone/gtk-glade/loginframe.c b/linphone/gtk-glade/loginframe.c
index da5d2753c4..5ed70eebea 100644
--- a/linphone/gtk-glade/loginframe.c
+++ b/linphone/gtk-glade/loginframe.c
@@ -61,6 +61,14 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){
LinphoneCore *lc=linphone_gtk_get_core();
int nettype;
+
+ if (linphone_core_get_download_bandwidth(lc)==0 &&
+ linphone_core_get_upload_bandwidth(lc)==0)
+ nettype=NetworkKindOpticalFiber;
+ else nettype=NetworkKindAdsl;
+ gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"login_internet_kind")),nettype);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"internet_kind")),nettype);
+
if (linphone_gtk_get_ui_config_int("automatic_login",0) ){
g_timeout_add(250,(GSourceFunc)do_login_noprompt,cfg);
return;
@@ -86,11 +94,7 @@ void linphone_gtk_show_login_frame(LinphoneProxyConfig *cfg){
from->url->username);
gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(mw,"login_password")),
ai!=NULL ? ai->passwd : "");
- if (linphone_core_get_download_bandwidth(lc)==0 &&
- linphone_core_get_upload_bandwidth(lc)==0)
- nettype=NetworkKindOpticalFiber;
- else nettype=NetworkKindAdsl;
- gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(mw,"login_internet_kind")),nettype);
+
osip_from_free(from);
}
diff --git a/linphone/gtk-glade/main.glade b/linphone/gtk-glade/main.glade
index 5acd379eab..e64cbc1932 100644
--- a/linphone/gtk-glade/main.glade
+++ b/linphone/gtk-glade/main.glade
@@ -536,7 +536,7 @@ Online users</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="login_internet_kind1">
+ <widget class="GtkComboBox" id="internet_kind">
<property name="visible">True</property>
<property name="active">0</property>
<property name="items" translatable="yes">ADSL
--
GitLab