changeset 8672:142108e89399

[gaim-migrate @ 9424] "This patch contains two fixes. The first is rather trivial, just removes the declaration of extra pointer used for deleting a message and deletes the message directly. The second is the real bug that needed fixing. Short Explanation: The old code only fixed the message that was being displayed, and still sent the original unchecked message to the receiving party. All I did was add a handler to the load_plugin function to make it fix the message being sent as well. Longer Explanation: In my cursory look through the gaim code (warning, <15 minutes) it appears the message pointer send to all the various *-im-msg and *-chat-msg handlers is a copy of the original string each time. This means if you fix the string at one stage (displaying), you have to fix it again at the next (sending). This seems rather inefficient, but hey, it's your client, maybe it was a design feature. Anyway, the spellchk plugin was only fixing the displayed message, and not the message being sent. So I thought my messages were being fixed while those receiving them new I was screwing up. I added substitute_somethingorother handler for the sending-im-msg callback in the load_plugin function. Other comments: I didn't look to deeply into it since it's so late, but the "displaying-chat-msg" and "sending-chat-msg" callbacks appear to be broken. The spellchk.c currently has a handler registered for the first callback, but the message displayed on my screen still contains the original typos. If I try to register a handler for the second callback listed, Gaim crashes when sending the message to a chat window. As I said, I didn't look into why it was crashing, I just removed my attempt to handle it and built this patch." --Matt Brenneke committer: Tailor Script <[e-mail]>

--- a/COPYRIGHT	Fri Apr 16 04:39:03 2004 +0000
+++ b/COPYRIGHT	Fri Apr 16 14:39:34 2004 +0000
@@ -17,6 +17,7 @@
 Graham Booker
 Craig Boston
 Chris Boyle
+Matt Brenneke
 Jeremy Brooks
 Philip Brown
 Sean Burke

--- a/plugins/spellchk.c	Fri Apr 16 04:39:03 2004 +0000
+++ b/plugins/spellchk.c	Fri Apr 16 14:39:34 2004 +0000
@@ -214,16 +214,14 @@
 
 static void substitute(char **mes, int pos, int m, const char *text) {
 	char *new = g_malloc(strlen(*mes) + strlen(text) + 1);
-	char *tmp;
 	new[0] = 0;
 
 	strncat(new, *mes, pos);
 	strcat(new, text);
 
 	strcat(new, &(*mes)[pos + m]);
-	tmp = *mes;
+	g_free(*mes);
 	*mes = new;
-	g_free(tmp);
 }
 
 static GtkWidget *tree;
@@ -390,6 +388,8 @@
 						plugin, GAIM_CALLBACK(substitute_words), NULL);
 	gaim_signal_connect(conv_handle, "writing-chat-msg",
 						plugin, GAIM_CALLBACK(substitute_words), NULL);
+	gaim_signal_connect(conv_handle, "sending-im-msg",
+						plugin, GAIM_CALLBACK(substitute_words), NULL);
 
 	return TRUE;
 }