Mercurial > pidgin.yaz
changeset 10713:7d4ca0d36f25
[gaim-migrate @ 12307]
This change makes some things not crash at signon (IRC, for one)
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 21 Mar 2005 04:17:21 +0000 |
| parents | b41c48d890d8 |
| children | ad57a8b5495e |
| files | src/protocols/rendezvous/rendezvous.c src/status.c |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/rendezvous/rendezvous.c Mon Mar 21 03:37:59 2005 +0000 +++ b/src/protocols/rendezvous/rendezvous.c Mon Mar 21 04:17:21 2005 +0000 @@ -666,7 +666,7 @@ type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE, "offline", _("Offline"), FALSE, TRUE, FALSE); status_types = g_list_append(status_types, type); - type = gaim_status_type_new_full(GAIM_STATUS_ONLINE, "online", _("Online"), FALSE, TRUE, FALSE); + type = gaim_status_type_new_full(GAIM_STATUS_ONLINE, "available", _("Available"), FALSE, TRUE, FALSE); status_types = g_list_append(status_types, type); return status_types;
--- a/src/status.c Mon Mar 21 03:37:59 2005 +0000 +++ b/src/status.c Mon Mar 21 04:17:21 2005 +0000 @@ -795,6 +795,15 @@ { GaimValue *value; value = gaim_status_get_attr_value(status, id); + if (value == NULL) + { + gaim_debug_warning("status", "The attribute \"%s\" on the status \"%s\" is " + "not supported.\n", id, status->title); + /* Skip over the data and move on to the next attribute */ + va_arg(args, void *); + continue; + } + if (value->type == GAIM_TYPE_STRING) { const gchar *string_data = va_arg(args, const char *);