diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index ac8ca1c261e1835c114ff174b71edf0cbc067d18..2fe773469b4eb17031f39a8c0ed032a1c9f846bb 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -159,27 +159,16 @@ static GtkWidget * create_basic_tab(account_t **a)
gtk_widget_show(table);
gtk_container_add( GTK_CONTAINER( frame) , table );
-#ifdef DEBUG
- label = gtk_label_new_with_mnemonic ("ID:");
- gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
- gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
- entryID = gtk_entry_new();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryID);
- gtk_entry_set_text(GTK_ENTRY(entryID), curAccountID);
- gtk_widget_set_sensitive( GTK_WIDGET(entryID), FALSE);
- gtk_table_attach ( GTK_TABLE( table ), entryID, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-#endif
-
label = gtk_label_new_with_mnemonic (_("_Alias"));
- gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
entryAlias = gtk_entry_new();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryAlias);
gtk_entry_set_text(GTK_ENTRY(entryAlias), curAlias);
- gtk_table_attach ( GTK_TABLE( table ), entryAlias, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), entryAlias, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
label = gtk_label_new_with_mnemonic (_("_Protocol"));
- gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
entryProtocol = gtk_combo_box_new_text();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryProtocol);
@@ -199,7 +188,7 @@ static GtkWidget * create_basic_tab(account_t **a)
gtk_combo_box_append_text(GTK_COMBO_BOX(entryProtocol), _("Unknown"));
gtk_combo_box_set_active(GTK_COMBO_BOX(entryProtocol),2);
}
- gtk_table_attach ( GTK_TABLE( table ), entryProtocol, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), entryProtocol, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
/* Link signal 'changed' */
g_signal_connect (G_OBJECT (GTK_COMBO_BOX(entryProtocol)), "changed",
@@ -207,15 +196,15 @@ static GtkWidget * create_basic_tab(account_t **a)
currentAccount);
label = gtk_label_new_with_mnemonic (_("_Host name"));
- gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
entryHostname = gtk_entry_new();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryHostname);
gtk_entry_set_text(GTK_ENTRY(entryHostname), curHostname);
- gtk_table_attach ( GTK_TABLE( table ), entryHostname, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), entryHostname, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
label = gtk_label_new_with_mnemonic (_("_User name"));
- gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
#if GTK_CHECK_VERSION(2,16,0)
entryUsername = gtk_entry_new();
@@ -227,12 +216,12 @@ static GtkWidget * create_basic_tab(account_t **a)
#endif
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryUsername);
gtk_entry_set_text(GTK_ENTRY(entryUsername), curUsername);
- gtk_table_attach ( GTK_TABLE( table ), entryUsername, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), entryUsername, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
g_signal_connect(G_OBJECT (entryUsername), "changed", G_CALLBACK (update_credential_cb), NULL);
g_object_set_data (G_OBJECT (entryUsername), "column", GINT_TO_POINTER (COLUMN_CREDENTIAL_USERNAME));
label = gtk_label_new_with_mnemonic (_("_Password"));
- gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 7, 8, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
#if GTK_CHECK_VERSION(2,16,0)
entryPassword = gtk_entry_new();
@@ -247,17 +236,17 @@ static GtkWidget * create_basic_tab(account_t **a)
gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryPassword);
gtk_entry_set_text(GTK_ENTRY(entryPassword), curPassword);
- gtk_table_attach ( GTK_TABLE( table ), entryPassword, 1, 2, 7, 8, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), entryPassword, 1, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
g_signal_connect(G_OBJECT (entryPassword), "changed", G_CALLBACK (update_credential_cb), NULL);
g_object_set_data (G_OBJECT (entryPassword), "column", GINT_TO_POINTER (COLUMN_CREDENTIAL_PASSWORD));
label = gtk_label_new_with_mnemonic (_("_Voicemail number"));
- gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 8, 9, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), label, 0, 1, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
entryMailbox = gtk_entry_new();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryMailbox);
gtk_entry_set_text(GTK_ENTRY(entryMailbox), curMailbox);
- gtk_table_attach ( GTK_TABLE( table ), entryMailbox, 1, 2, 8, 9, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_table_attach ( GTK_TABLE( table ), entryMailbox, 1, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show_all( table );
gtk_container_set_border_width (GTK_CONTAINER(table), 10);
@@ -887,7 +876,7 @@ show_account_window (account_t * a)
GTK_RESPONSE_ACCEPT,
NULL));
- gtk_dialog_set_has_separator(dialog, TRUE);
+ gtk_dialog_set_has_separator(dialog, FALSE);
gtk_container_set_border_width (GTK_CONTAINER(dialog), 0);
notebook = gtk_notebook_new();
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 177a7b304f80fb6cabb5a670a52b6cf141a5156a..14e7b739be4b85709ffb44f136c286c573567755 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -1778,7 +1778,6 @@ ManagerImpl::getCurrentAudioDevicesIndex()
int
ManagerImpl::isIax2Enabled (void)
{
- //return ( IAX2_ENABLED ) ? true : false;
#ifdef USE_IAX
return true;
#else
@@ -2496,13 +2495,13 @@ ManagerImpl::getAccountList()
while (iter != _accountMap.end()) {
if (iter->second != NULL) {
+ //_debug("PUSHING BACK %s\n", iter->first.c_str());
v.push_back (iter->first.data());
}
iter++;
}
}
-
// Otherelse, load the custom one
// ie according to the saved order
else {
@@ -2511,7 +2510,7 @@ ManagerImpl::getAccountList()
// This account has not been loaded, so we ignore it
if ( (iter=_accountMap.find (account_order[i])) != _accountMap.end()) {
// If the account is valid
- if (iter->second != 0) {
+ if (iter->second != NULL) {
v.push_back (iter->first.data ());
}
}
@@ -2519,7 +2518,7 @@ ManagerImpl::getAccountList()
}
-
+
return v;
}
@@ -2729,7 +2728,7 @@ void ManagerImpl::setAccountDetails (const std::string& accountID, const std::ma
// Make sure not to re-hash the password field if
// it is already saved as a MD5 Hash.
// TODO: This test is weak. Fix this.
- if ((password.compare(getConfigString(accountID, PASSWORD)) != 0) && (password.length() != 32)) {
+ if ((password.compare(getConfigString(accountID, PASSWORD)) != 0)) {
_debug("Password sent and password from config are different. Re-hashing\n");
std::string hash;
if(authenticationName.empty()) {
@@ -2971,9 +2970,9 @@ void
ManagerImpl::removeAccount (const AccountID& accountID)
{
// Get it down and dying
- Account* remAccount = getAccount (accountID);
-
- if (remAccount) {
+ Account* remAccount = NULL;
+ remAccount = getAccount (accountID);
+ if (remAccount != NULL) {
remAccount->unregisterVoIPLink();
_accountMap.erase (accountID);
delete remAccount;