[Gaim-commits] SF.net SVN: gaim: [16352] branches/v2_0_0/src/protocols/irc

[<ebl...@us...>]

Revision: 16352
Author:   eblanton
Date:     2006-06-26 10:55:17 -0700 (Mon, 26 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16352&view=rev

Log Message:
-----------
------------------------------------------------------------------------
r16351 | eblanton | 2006-06-26 13:52:26 -0400 (Mon, 26 Jun 2006) | 1 line

Focus newly created IRC tabs created with /join and /query
------------------------------------------------------------------------

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/irc/cmds.c
    branches/v2_0_0/src/protocols/irc/msgs.c
Modified: branches/v2_0_0/src/protocols/irc/cmds.c
===================================================================
--- branches/v2_0_0/src/protocols/irc/cmds.c	2006-06-26 17:52:26 UTC (rev 16351)
+++ branches/v2_0_0/src/protocols/irc/cmds.c	2006-06-26 17:55:17 UTC (rev 16352)
@@ -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);

Modified: branches/v2_0_0/src/protocols/irc/msgs.c
===================================================================
--- branches/v2_0_0/src/protocols/irc/msgs.c	2006-06-26 17:52:26 UTC (rev 16351)
+++ branches/v2_0_0/src/protocols/irc/msgs.c	2006-06-26 17:55:17 UTC (rev 16352)
@@ -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;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.