pidgin: 372b94fa: Make sure an existing conversation selec...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 372b94fab52b770bd853506200652575d0588539
Ancestor: e4cc3b79eb04e4937c5fa764f6839a8e07397651
Author: sadrul at pidgin.im
Date: 2008-03-06T15:54:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/372b94fab52b770bd853506200652575d0588539

Modified files:
        finch/gntblist.c finch/gntconv.c

ChangeLog: 

Make sure an existing conversation selected from the 'Send IM' dialog is given the focus.

-------------- next part --------------
============================================================
--- finch/gntblist.c	3fa06a30410a73d35042a178684ce1f59239719e
+++ finch/gntblist.c	70f5b90829bdae8477f7ba7dd5d46aca8ab5eed2
@@ -2610,11 +2610,13 @@ send_im_select_cb(gpointer data, PurpleR
 {
 	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
============================================================
--- finch/gntconv.c	19fecbca5ee43a9e46b578613e29dd95562ca247
+++ finch/gntconv.c	e5d2103e8056ee41a5a15cb84b7d2874805fe8e3
@@ -660,8 +660,10 @@ finch_create_conversation(PurpleConversa
 	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));