# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1130715411 0
# Node ID fe12abd6b87971954cec11acbb5eb19bea5ae3d7
# Parent  700ec4523c04c508b1f8b467cde262ee16575206
[gaim-migrate @ 14202]
SF Patch #1339005 from Sadrul

"This patch is a fix for this small bug:

 (1) open a new conversation with some buddy in a contact.
 (2) open another conversation with another buddy in the
 same contact.
 (3) now press space/enter on the first buddy in the
 buddy-list. you will notice that the active-buddy in
 the conversation doesn't change to the buddy you just
 activated."

committer: Tailor Script <tailor@pidgin.im>

diff -r 700ec4523c04 -r fe12abd6b879 plugins/ChangeLog.API
--- a/plugins/ChangeLog.API	Sun Oct 30 23:33:36 2005 +0000
+++ b/plugins/ChangeLog.API	Sun Oct 30 23:36:51 2005 +0000
@@ -129,6 +129,7 @@
 	* gaim_plugin_get_description()
 	* gaim_plugin_get_author()
 	* gaim_plugin_get_homepage()
+	* gaim_gtkconv_switch_active_conversation(GaimConversation *)
 
 	Signals - Changed:
 	* "received-im-msg" and "received-chat-msg" to match, both now pass a
diff -r 700ec4523c04 -r fe12abd6b879 src/gtkconv.c
--- a/src/gtkconv.c	Sun Oct 30 23:33:36 2005 +0000
+++ b/src/gtkconv.c	Sun Oct 30 23:36:51 2005 +0000
@@ -1942,7 +1942,7 @@
 		gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(gtkconv->win->menu.logging)));
 }
 
-static void
+void
 gaim_gtkconv_switch_active_conversation(GaimConversation *conv)
 {
 	GaimGtkConversation *gtkconv;
diff -r 700ec4523c04 -r fe12abd6b879 src/gtkconv.h
--- a/src/gtkconv.h	Sun Oct 30 23:33:36 2005 +0000
+++ b/src/gtkconv.h	Sun Oct 30 23:36:51 2005 +0000
@@ -181,6 +181,13 @@
 void gaim_gtkconv_update_buddy_icon(GaimConversation *conv);
 
 /**
+ * Sets the active conversation within a GTK-conversation.
+ *
+ * @param conv The conversation
+ */
+void gaim_gtkconv_switch_active_conversation(GaimConversation *conv);
+
+/**
  * Updates the tab positions on all conversation windows to reflect any
  * changed preferences.
  */
diff -r 700ec4523c04 -r fe12abd6b879 src/gtkdialogs.c
--- a/src/gtkdialogs.c	Sun Oct 30 23:33:36 2005 +0000
+++ b/src/gtkdialogs.c	Sun Oct 30 23:36:51 2005 +0000
@@ -528,6 +528,7 @@
 	win = GAIM_GTK_CONVERSATION(conv)->win;
 
 	gtk_window_present(GTK_WINDOW(win->window));
+	gaim_gtkconv_switch_active_conversation(conv);
 	gaim_gtk_conv_window_switch_gtkconv(win, GAIM_GTK_CONVERSATION(conv));
 }