# HG changeset patch # User Christian Hammond # Date 1056512403 0 # Node ID bc71bd31c22381d3549816d5a5dc1e182c5a8dc5 # Parent a6f7d4f0198189fa0ebb4ac2e17d6e3150cdb894 [gaim-migrate @ 6397] More checking for empty strings during account loading. committer: Tailor Script diff -r a6f7d4f01981 -r bc71bd31c223 src/account.c --- a/src/account.c Tue Jun 24 19:27:59 2003 +0000 +++ b/src/account.c Wed Jun 25 03:40:03 2003 +0000 @@ -841,7 +841,7 @@ } } else if (data->tag == TAG_PASSWORD) { - if (strcmp(buffer, "")) { + if (*buffer != '\0') { if (data->in_proxy) { gaim_proxy_info_set_password(data->proxy_info, buffer); } @@ -851,12 +851,18 @@ } } } - else if (data->tag == TAG_ALIAS) - gaim_account_set_alias(data->account, buffer); - else if (data->tag == TAG_USERINFO) - gaim_account_set_user_info(data->account, buffer); - else if (data->tag == TAG_BUDDYICON) - gaim_account_set_buddy_icon(data->account, buffer); + else if (data->tag == TAG_ALIAS) { + if (*buffer != '\0') + gaim_account_set_alias(data->account, buffer); + } + else if (data->tag == TAG_USERINFO) { + if (*buffer != '\0') + gaim_account_set_user_info(data->account, buffer); + } + else if (data->tag == TAG_BUDDYICON) { + if (*buffer != '\0') + gaim_account_set_buddy_icon(data->account, buffer); + } else if (data->tag == TAG_TYPE) { if (data->in_proxy) { if (!strcmp(buffer, "global")) @@ -876,15 +882,15 @@ } } else if (data->tag == TAG_HOST) { - if (data->in_proxy && strcmp(buffer, "")) + if (data->in_proxy && *buffer != '\0') gaim_proxy_info_set_host(data->proxy_info, buffer); } else if (data->tag == TAG_PORT) { - if (data->in_proxy && strcmp(buffer, "")) + if (data->in_proxy && *buffer != '\0') gaim_proxy_info_set_port(data->proxy_info, atoi(buffer)); } else if (data->tag == TAG_SETTING) { - if (strcmp(buffer, "")) { + if (*buffer != '\0') { if (data->setting_ui != NULL) { if (data->setting_type == GAIM_PREF_STRING) gaim_account_set_ui_string(data->account, data->setting_ui, @@ -920,7 +926,7 @@ gaim_proxy_info_destroy(data->proxy_info); data->proxy_info = NULL; } - else if (strcmp(buffer, "")) { + else if (*buffer != '\0') { gaim_account_set_proxy_info(data->account, data->proxy_info); } }