# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1204818939 0
# Node ID d83adbf0c92c77e15aaae3ce19b1a484c8876036
# Parent  b0b8c94118c802115799979e2e7517bb18806fa1# Parent  eab5bc54e163c3a434713cf5c8a769b4800cbaf5
merge of '372b94fab52b770bd853506200652575d0588539'
     and 'e4b22781fe6c2a7cd1133ee36a308ede967be25e'

diff -r eab5bc54e163 -r d83adbf0c92c finch/gntblist.c
--- a/finch/gntblist.c	Thu Mar 06 11:34:11 2008 +0000
+++ b/finch/gntblist.c	Thu Mar 06 15:55:39 2008 +0000
@@ -2610,11 +2610,13 @@
 {
 	PurpleAccount *account;
 	const char *username;
+	PurpleConversation *conv;
 
 	account  = purple_request_fields_get_account(fields, "account");
 	username = purple_request_fields_get_string(fields,  "screenname");
 
-	purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
+	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
+	purple_conversation_present(conv);
 }
 
 static void
diff -r eab5bc54e163 -r d83adbf0c92c finch/gntconv.c
--- a/finch/gntconv.c	Thu Mar 06 11:34:11 2008 +0000
+++ b/finch/gntconv.c	Thu Mar 06 15:55:39 2008 +0000
@@ -660,8 +660,10 @@
 	PurpleAccount *account;
 	PurpleBlistNode *convnode = NULL;
 
-	if (ggc)
+	if (ggc) {
+		gnt_window_present(ggc->window);
 		return;
+	}
 
 	account = purple_conversation_get_account(conv);
 	cc = find_conv_with_contact(account, purple_conversation_get_name(conv));