Mercurial > pidgin3 / changeset

--- a/src/protocols/irc/cmds.c	Mon Jun 26 09:03:54 2006 +0000
+++ b/src/protocols/irc/cmds.c	Mon Jun 26 17:52:26 2006 +0000
@@ -402,6 +402,7 @@
 		return 0;
 
 	convo = gaim_conversation_new(GAIM_CONV_TYPE_IM, irc->account, args[0]);
+	gaim_conversation_present(convo);
 
 	if (args[1]) {
 		gc = gaim_account_get_connection(irc->account);

--- a/src/protocols/irc/msgs.c	Mon Jun 26 09:03:54 2006 +0000
+++ b/src/protocols/irc/msgs.c	Mon Jun 26 17:52:26 2006 +0000
@@ -675,6 +675,14 @@
 		/* We are joining a channel for the first time */
 		serv_got_joined_chat(gc, id++, args[0]);
 		g_free(nick);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
+							    args[0],
+							    irc->account);
+		if (convo == NULL) {
+			gaim_debug_error("irc", "tried to join %s but couldn't\n", args[0]);
+			return;
+		}
+		gaim_conversation_present(convo);
 		return;
 	}