[Gaim-commits] CVS: gaim/src plugins.c,1.79,1.80 server.c,1.191,1.192

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv29846/src

Modified Files:
	plugins.c server.c 
Log Message:
hi usa


Index: plugins.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/plugins.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- plugins.c	2001/09/24 19:32:57	1.79
+++ plugins.c	2001/09/26 00:53:49	1.80
@@ -867,7 +867,7 @@
 	case event_chat_recv:
 	case event_chat_send_invite:
 		g_snprintf(buf, sizeof buf, "%lu %d \"%s\" %s", (unsigned long)arg1,
-				(int)arg2, (char *)arg3, (char *)arg4);
+				(int)arg2, (char *)arg3, *(char **)arg4 ? *(char **)arg4 : "(null)");
 		break;
 	case event_chat_send:
 		g_snprintf(buf, sizeof buf, "%lu %d %s", (unsigned long)arg1, (int)arg2,

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- server.c	2001/09/22 09:14:27	1.191
+++ server.c	2001/09/26 00:53:49	1.192
@@ -302,9 +302,12 @@
 
 void serv_chat_invite(struct gaim_connection *g, int id, char *message, char *name)
 {
-	plugin_event(event_chat_send_invite, g, (void *)id, name, message);
+	char *buffy = message && *message ? g_strdup(message) : NULL;
+	plugin_event(event_chat_send_invite, g, (void *)id, name, &buffy);
 	if (g->prpl && g->prpl->chat_invite)
-		(*g->prpl->chat_invite)(g, id, message, name);
+		(*g->prpl->chat_invite)(g, id, buffy, name);
+	if (buffy)
+		g_free(buffy);
 }
 
 void serv_chat_leave(struct gaim_connection *g, int id)