[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.71,1.72

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory usw-pr-cvs1:/tmp/cvs-serv15460/src/protocols/irc

Modified Files:
	irc.c 
Log Message:
Told you I should have looked it over better.  It still has issues... I'll do them later.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- irc.c	11 Mar 2002 04:41:12 -0000	1.71
+++ irc.c	11 Mar 2002 06:14:46 -0000	1.72
@@ -1432,6 +1432,7 @@
 	struct dcc_chat *dccchat = find_dcc_chat(gc, who);
 	struct irc_data *id = gc->proto_data;
 	g_free(tmp);
+	what = str->str;
 	if (*what != '/') {
 		unsigned int max = 440 - strlen(who);
 		char t;
@@ -1439,30 +1440,30 @@
 			t = what[max];
 			what[max] = 0;
 			if (dccchat) {
-				g_snprintf(buf, sizeof(buf), "%s\r\n", str->str);
+				g_snprintf(buf, sizeof(buf), "%s\r\n", what);
 				irc_write(dccchat->fd, buf, strlen(buf));
 				g_string_free(str, TRUE);
 				return 1;
 			}
-			g_snprintf(buf, sizeof(buf), "PRIVMSG %s :%s\r\n", who, str->str);
+			g_snprintf(buf, sizeof(buf), "PRIVMSG %s :%s\r\n", who, what);
 			irc_write(id->fd, buf, strlen(buf));
 			what[max] = t;
 			what = what + max;
 		}
 		if (dccchat) {
-			g_snprintf(buf, sizeof(buf), "%s\r\n", str->str);
+			g_snprintf(buf, sizeof(buf), "%s\r\n", what);
 			irc_write(dccchat->fd, buf, strlen(buf));
 			g_string_free(str, TRUE);
 			return 1;
 		}
-		g_snprintf(buf, sizeof(buf), "PRIVMSG %s :%s\r\n", who, str->str);
+		g_snprintf(buf, sizeof(buf), "PRIVMSG %s :%s\r\n", who, what);
 		irc_write(id->fd, buf, strlen(buf));
 		g_string_free(str, TRUE);
 		return 1;
 	}
 	
 	what++;
-	process_data_init(pdibuf, str->str, word, word_eol, TRUE);
+	process_data_init(pdibuf, what, word, word_eol, TRUE);
 	g_string_free(str, TRUE);
 	if (!g_strcasecmp(pdibuf, "ME")) {
 		if (dccchat) {