# HG changeset patch # User Christian Hammond # Date 1056948352 0 # Node ID 49ae70ffcea5445e75900e6cef742ed58022f1f8 # Parent 041b657227c4ceaecd9109792bfe81a821b1c459 [gaim-migrate @ 6426] The check mail option now actually works. It turns out I was quite stupid and cleared all settings almost immediately after setting that one. Doh. committer: Tailor Script diff -r 041b657227c4 -r 49ae70ffcea5 src/account.c --- a/src/account.c Mon Jun 30 03:12:40 2003 +0000 +++ b/src/account.c Mon Jun 30 04:45:52 2003 +0000 @@ -395,6 +395,9 @@ g_return_if_fail(account != NULL); g_return_if_fail(name != NULL); + gaim_debug(GAIM_DEBUG_INFO, "account", "Setting bool: %s, %d\n", + name, value); + setting = g_new0(GaimAccountSetting, 1); setting->type = GAIM_PREF_BOOLEAN; @@ -411,7 +414,7 @@ GHashTable *table; table = g_hash_table_lookup(account->ui_settings, ui); - + if (table == NULL) { table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, delete_setting); @@ -646,11 +649,17 @@ g_return_val_if_fail(account != NULL, default_value); g_return_val_if_fail(name != NULL, default_value); + gaim_debug(GAIM_DEBUG_INFO, "account", "looking for bool setting: %s\n", + name); + setting = g_hash_table_lookup(account->settings, name); if (setting == NULL) return default_value; + gaim_debug(GAIM_DEBUG_INFO, "account", "bool setting found: %s, %d\n", + name, setting->value.bool); + g_return_val_if_fail(setting->type == GAIM_PREF_BOOLEAN, default_value); return setting->value.bool; diff -r 041b657227c4 -r 49ae70ffcea5 src/account.h --- a/src/account.h Mon Jun 30 03:12:40 2003 +0000 +++ b/src/account.h Mon Jun 30 04:45:52 2003 +0000 @@ -47,7 +47,6 @@ char *buddy_icon; /**< The buddy icon. */ gboolean remember_pass; /**< Remember the password. */ - gboolean check_mail; /**< Check for mail. */ char *protocol_id; /**< The ID of the protocol. */ diff -r 041b657227c4 -r 49ae70ffcea5 src/gtkaccount.c --- a/src/gtkaccount.c Mon Jun 30 03:12:40 2003 +0000 +++ b/src/gtkaccount.c Mon Jun 30 04:45:52 2003 +0000 @@ -945,6 +945,9 @@ gaim_account_set_protocol_id(dialog->account, dialog->protocol_id); } + /* Clear the existing settings. */ + gaim_account_clear_settings(dialog->account); + /* Alias */ value = gtk_entry_get_text(GTK_ENTRY(dialog->alias_entry)); @@ -977,8 +980,6 @@ gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(dialog->auto_login_check))); - /* TODO: Do something about auto-login. */ - /* Password */ value = gtk_entry_get_text(GTK_ENTRY(dialog->password_entry)); @@ -1016,7 +1017,6 @@ g_free(username); /* Add the protocol settings */ - gaim_account_clear_settings(dialog->account); for (l = dialog->prpl_info->protocol_options, l2 = dialog->protocol_opt_entries;