# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 988667347 0
# Node ID f4ae086c746b4852b079eb947e325bcb633675c1
# Parent  cf7806e63d0c06de5758d9214bce9a0282e93b0d
[gaim-migrate @ 1795]
ha! i'm stupid.

committer: Tailor Script <tailor@pidgin.im>

diff -r cf7806e63d0c -r f4ae086c746b src/gaim.h
--- a/src/gaim.h	Mon Apr 30 19:09:22 2001 +0000
+++ b/src/gaim.h	Mon Apr 30 21:49:07 2001 +0000
@@ -652,7 +652,7 @@
 extern void serv_got_im(struct gaim_connection *, char *, char *, int, time_t);
 extern void serv_got_eviled(struct gaim_connection *, char *, int);
 extern void serv_got_chat_invite(struct gaim_connection *, char *, int, char *, char *);
-extern void serv_got_joined_chat(struct gaim_connection *, int, char *);
+extern struct conversation *serv_got_joined_chat(struct gaim_connection *, int, char *);
 extern void serv_got_chat_left(struct gaim_connection *, int);
 extern void serv_got_chat_in(struct gaim_connection *, int, char *, int, char *, time_t);
 
diff -r cf7806e63d0c -r f4ae086c746b src/server.c
--- a/src/server.c	Mon Apr 30 19:09:22 2001 +0000
+++ b/src/server.c	Mon Apr 30 21:49:07 2001 +0000
@@ -524,7 +524,7 @@
 			struct queued_message *qm;
 			qm = g_new0(struct queued_message, 1);
 			g_snprintf(qm->name, sizeof(qm->name), "%s", name);
-			qm->message = g_strdup(message);
+			qm->message = g_strdup(away_subs(tmpmsg, alias));
 			qm->gc = gc;
 			qm->tm = mtime;
 			qm->flags = WFLAG_SEND | WFLAG_AUTO;
@@ -781,7 +781,7 @@
 	gtk_widget_show(d);
 }
 
-void serv_got_joined_chat(struct gaim_connection *gc, int id, char *name)
+struct conversation *serv_got_joined_chat(struct gaim_connection *gc, int id, char *name)
 {
 	struct conversation *b;
 
@@ -821,6 +821,8 @@
 	}
 
 	show_new_buddy_chat(b);
+
+	return b;
 }
 
 void serv_got_chat_left(struct gaim_connection *g, int id)