# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 984774808 0
# Node ID ac8eddd16e893f666d05685ccd1fe03cffec9e4f
# Parent  ec31e23aadc79001e6c6426a091d4604f1402da2
[gaim-migrate @ 1604]
fixes for my stupidity

committer: Tailor Script <tailor@pidgin.im>

diff -r ec31e23aadc7 -r ac8eddd16e89 src/buddy.c
--- a/src/buddy.c	Fri Mar 16 14:29:54 2001 +0000
+++ b/src/buddy.c	Fri Mar 16 20:33:28 2001 +0000
@@ -420,7 +420,8 @@
 		
 			update_buttons_by_protocol(c);
                 }
-		raise_convo_tab(c);
+		if (display_options & OPT_DISP_ONE_WINDOW)
+			raise_convo_tab(c);
 	} else if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
 		GtkWidget *menu;
 		GtkWidget *button;
diff -r ec31e23aadc7 -r ac8eddd16e89 src/conversation.c
--- a/src/conversation.c	Fri Mar 16 14:29:54 2001 +0000
+++ b/src/conversation.c	Fri Mar 16 20:33:28 2001 +0000
@@ -1976,6 +1976,8 @@
 
 	entry = gtk_text_new(NULL, NULL);
 	c->entry = entry;
+	if (!(display_options & OPT_DISP_ONE_WINDOW))
+		gtk_window_set_focus(GTK_WINDOW(c->window), c->entry);
 
 	toolbar = build_conv_toolbar(c);
 	gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 0);