# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 985159543 0
# Node ID 8c92ea5d854fbf569d3155810ecf1cbf29445cd7
# Parent  12bd198b67219d8821dc87f08b82f25839ffc655
[gaim-migrate @ 1635]
good stuff

committer: Tailor Script <tailor@pidgin.im>

diff -r 12bd198b6721 -r 8c92ea5d854f src/buddy.c
--- a/src/buddy.c	Wed Mar 21 03:25:57 2001 +0000
+++ b/src/buddy.c	Wed Mar 21 07:25:43 2001 +0000
@@ -2366,7 +2366,7 @@
 
         gtk_widget_show(menubar);
 
-	vbox       = gtk_vbox_new(FALSE, 5);
+	vbox       = gtk_vbox_new(FALSE, 0);
         
         notebook = gtk_notebook_new();
 
diff -r 12bd198b6721 -r 8c92ea5d854f src/conversation.c
--- a/src/conversation.c	Wed Mar 21 03:25:57 2001 +0000
+++ b/src/conversation.c	Wed Mar 21 07:25:43 2001 +0000
@@ -648,7 +648,7 @@
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 			}
 		}
-		if (display_options & OPT_DISP_ONE_WINDOW) {
+		if (!c->is_chat && (display_options & OPT_DISP_ONE_WINDOW)) {
 			if (event->keyval == '[') {
 				gtk_notebook_prev_page(GTK_NOTEBOOK(convo_notebook));
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
@@ -696,8 +696,9 @@
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 			}
 		}
-	} else if ((display_options & OPT_DISP_ONE_WINDOW) && (event->state & GDK_MOD1_MASK) &&
-			isdigit(event->keyval) && (event->keyval > '0')) {
+	} else if (!c->is_chat && (display_options & OPT_DISP_ONE_WINDOW) &&
+			(event->state & GDK_MOD1_MASK) && isdigit(event->keyval) &&
+			(event->keyval > '0')) {
 		gtk_notebook_set_page(GTK_NOTEBOOK(convo_notebook), event->keyval - '1');
 		gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 	}