diff src/server.c @ 1100:f168625b63fe

[gaim-migrate @ 1110] some perl updates, and indication of which account got warned committer: Tailor Script <[e-mail]>

--- a/src/server.c	Thu Nov 16 07:35:58 2000 +0000
+++ b/src/server.c	Thu Nov 16 08:48:01 2000 +0000
@@ -307,9 +307,12 @@
 
 	char *buffy = g_strdup(message);
 	char *angel = g_strdup(name);
-	plugin_event(event_im_recv, gc, &angel, &buffy, 0);
-	if (!buffy || !angel)
+	int plugin_return = plugin_event(event_im_recv, gc, &angel, &buffy, 0);
+	if (!buffy || !angel || plugin_return) {
+		if (buffy) g_free(buffy);
+		if (angel) g_free(angel);
 		return;
+	}
 	g_snprintf(message, strlen(message) + 1, "%s", buffy);
 	g_free(buffy);
 	g_snprintf(name, strlen(name) + 1, "%s", angel);
@@ -497,16 +500,16 @@
 
 
 
-void serv_got_eviled(char *name, int lev)
+void serv_got_eviled(struct gaim_connection *gc, char *name, int lev)
 {
         char *buf2 = g_malloc(1024);
         GtkWidget *d, *label, *close;
 
 
-	plugin_event(event_warned, name, (void *)lev, 0, 0);
+	plugin_event(event_warned, gc, name, (void *)lev, 0);
 
-        g_snprintf(buf2, 1023, "You have just been warned by %s.\nYour new warning level is %d%%",
-                   ((name == NULL) ? "an anonymous person" : name) , lev);
+        g_snprintf(buf2, 1023, "%s have just been warned by %s.\nYour new warning level is %d%%",
+                   gc->username, ((name == NULL) ? "an anonymous person" : name) , lev);
 
 
         d = gtk_dialog_new();
@@ -694,7 +697,8 @@
         if (!b)
                 return;
         
-	plugin_event(event_chat_recv, g, b->name, who, message);
+	if (plugin_event(event_chat_recv, g, b->name, who, message))
+		return;
 
         if (whisper)
                 w = WFLAG_WHISPER;