Mercurial > pidgin
diff libpurple/dnsquery.c @ 15828:2edbd4fede72
merge of '921657d3f21f5190639852247331d608f5946095'
and 'fab2ec4334c8c32a4a33cf74896fdbf48dc76365'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 19 Mar 2007 13:31:34 +0000 |
| parents | 32c366eeeb99 76bdff454d6f |
| children | c028fc690b5d |
line wrap: on
line diff
--- a/libpurple/dnsquery.c Mon Mar 19 07:01:17 2007 +0000 +++ b/libpurple/dnsquery.c Mon Mar 19 13:31:34 2007 +0000 @@ -758,7 +758,7 @@ { char message[1024]; g_snprintf(message, sizeof(message), _("Thread creation failure: %s"), - err ? err->message : _("Unknown reason")); + (err && err->message) ? err->message : _("Unknown reason")); g_error_free(err); purple_dnsquery_failed(query_data, message); }