Mercurial > pidgin.yaz
changeset 5664:7867ae4836ac
[gaim-migrate @ 6079]
Fixed some more warnings (I think) from when you add a new account.
Unfortunately, it seems that importing prefs and accounts from the old
.gaimrc is having some issues. I know why, will fix. :/
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Mon, 02 Jun 2003 10:10:37 +0000 |
| parents | e9551e7d6f01 |
| children | 132a30783c3d |
| files | src/gtkaccount.c |
| diffstat | 1 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkaccount.c Mon Jun 02 10:03:03 2003 +0000 +++ b/src/gtkaccount.c Mon Jun 02 10:10:37 2003 +0000 @@ -414,9 +414,12 @@ switch (gaim_account_option_get_type(option)) { case GAIM_PREF_BOOLEAN: - bool_value = gaim_account_get_bool(dialog->account, - gaim_account_option_get_setting(option), - gaim_account_option_get_default_bool(option)); + if (dialog->account == NULL) + bool_value = gaim_account_option_get_default_bool(option); + else + bool_value = gaim_account_get_bool(dialog->account, + gaim_account_option_get_setting(option), + gaim_account_option_get_default_bool(option)); check = gtk_check_button_new_with_label( gaim_account_option_get_text(option)); @@ -429,9 +432,12 @@ break; case GAIM_PREF_INT: - int_value = gaim_account_get_int(dialog->account, - gaim_account_option_get_setting(option), - gaim_account_option_get_default_int(option)); + if (dialog->account == NULL) + int_value = gaim_account_option_get_default_int(option); + else + int_value = gaim_account_get_int(dialog->account, + gaim_account_option_get_setting(option), + gaim_account_option_get_default_int(option)); g_snprintf(buf, sizeof(buf), "%d", int_value); @@ -447,9 +453,12 @@ break; case GAIM_PREF_STRING: - str_value = gaim_account_get_string(dialog->account, - gaim_account_option_get_setting(option), - gaim_account_option_get_default_string(option)); + if (dialog->account == NULL) + str_value = gaim_account_option_get_default_string(option); + else + str_value = gaim_account_get_string(dialog->account, + gaim_account_option_get_setting(option), + gaim_account_option_get_default_string(option)); entry = gtk_entry_new();