Mercurial > pidgin
changeset 10690:5c6326fe4190
[gaim-migrate @ 12241]
Zephyr fixes from Derrick J Brashear
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sun, 13 Mar 2005 23:30:33 +0000 |
| parents | 04e61e64db63 |
| children | fb30c4b67856 |
| files | src/protocols/zephyr/ZRecvNot.c src/protocols/zephyr/zephyr.c |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/zephyr/ZRecvNot.c Sun Mar 13 14:23:10 2005 +0000 +++ b/src/protocols/zephyr/ZRecvNot.c Sun Mar 13 23:30:33 2005 +0000 @@ -4,7 +4,7 @@ * Created by: Robert French * * $Source$ - * $Author: chipx86 $ + * $Author: seanegan $ * * Copyright (c) 1987,1988 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file @@ -32,6 +32,9 @@ nextq = Z_GetFirstComplete(); + if (!nextq) + return (ENOMEM); + len = nextq->packet_len; if (!(buffer = (char *) malloc((unsigned) len)))
--- a/src/protocols/zephyr/zephyr.c Sun Mar 13 14:23:10 2005 +0000 +++ b/src/protocols/zephyr/zephyr.c Sun Mar 13 23:30:33 2005 +0000 @@ -674,7 +674,7 @@ static void message_failed(GaimConnection *gc, ZNotice_t notice, struct sockaddr_in from) { if (g_ascii_strcasecmp(notice.z_class, "message")) { - gchar* chat_failed = g_strdup_printf(_("Unable send to chat %s,%s,%s"),notice.z_class,notice.z_class_inst,notice.z_recipient); + gchar* chat_failed = g_strdup_printf(_("Unable to send to chat %s,%s,%s"),notice.z_class,notice.z_class_inst,notice.z_recipient); gaim_notify_error(gc,"",chat_failed,NULL); g_free(chat_failed); } else {