# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1110756633 0
# Node ID 5c6326fe4190a26334e69b2fa1a4251628f7e126
# Parent  04e61e64db635d39235bd14d8cd9711cc4caca6c
[gaim-migrate @ 12241]
Zephyr fixes from Derrick J Brashear

committer: Tailor Script <tailor@pidgin.im>

diff -r 04e61e64db63 -r 5c6326fe4190 src/protocols/zephyr/ZRecvNot.c
--- 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)))
diff -r 04e61e64db63 -r 5c6326fe4190 src/protocols/zephyr/zephyr.c
--- 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 {