From 665bac7dab8387a84575c9f8ac70d9bb9534a641 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Wed, 14 Jul 2010 14:00:56 -0400
Subject: [PATCH] [#3649] Fix new account configuration dialog loading
---
sflphone-client-gnome/src/config/accountconfigdialog.c | 8 +++++---
sflphone-common/src/sip/sipaccount.cpp | 4 ----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index 97c0bb1344..7323ba0b4c 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -443,7 +443,7 @@ static void fill_treeview_with_credential (GtkListStore * credentialStore, accou
{
GtkTreeIter iter;
gtk_list_store_clear(credentialStore);
-
+
/* This is the default, undeletable credential */
/*
// gtk_list_store_append (credentialStore, &iter);
@@ -471,11 +471,11 @@ static void fill_treeview_with_credential (GtkListStore * credentialStore, accou
g_signal_handlers_disconnect_by_func (G_OBJECT(entryUsername), G_CALLBACK(update_credential_cb), NULL);
}
- if(account->credential_information == NULL) {
+ */
+ if(account->credential_information == NULL) {
DEBUG("No credential defined");
return;
}
- */
unsigned int i;
for(i = 0; i < account->credential_information->len; i++)
@@ -816,7 +816,9 @@ GtkWidget* create_credential_widget (account_t **a) {
gtk_container_add(GTK_CONTAINER(scrolledWindowCredential), treeViewCredential);
+ DEBUG("Credential pas ok");
fill_treeview_with_credential(credentialStore, *a);
+ DEBUG("Credential ok");
/* Credential Buttons */
hbox = gtk_hbox_new(FALSE, 10);
diff --git a/sflphone-common/src/sip/sipaccount.cpp b/sflphone-common/src/sip/sipaccount.cpp
index d2cb0e0178..8549bb95c9 100755
--- a/sflphone-common/src/sip/sipaccount.cpp
+++ b/sflphone-common/src/sip/sipaccount.cpp
@@ -623,8 +623,6 @@ std::map<std::string, std::string> SIPAccount::getAccountDetails()
a.insert(std::pair<std::string, std::string>(REGISTRATION_STATE_CODE, registrationStateCode));
a.insert(std::pair<std::string, std::string>(REGISTRATION_STATE_DESCRIPTION, registrationStateDescription));
- _debug("OK for default");
-
// Add sip specific details
if(getType() == "SIP") {
@@ -655,8 +653,6 @@ std::map<std::string, std::string> SIPAccount::getAccountDetails()
a.insert(std::pair<std::string, std::string>(ZRTP_HELLO_HASH, getZrtpHelloHash() ? "true" : "false"));
a.insert(std::pair<std::string, std::string>(ZRTP_NOT_SUPP_WARNING, getZrtpNotSuppWarning() ? "true" : "false"));
- _debug("OK for default again");
-
// TLS listener is unique and parameters are modified through IP2IP_PROFILE
std::stringstream tlslistenerport;
tlslistenerport << getTlsListenerPort();
--
GitLab