# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1074139332 0
# Node ID 70816fbc2541f7c3edc2e57946d7619e91a67d41
# Parent  42c7227d6e4d1063d8c1e0771b84694c4bed8476
[gaim-migrate @ 8806]
I think I got ctrl+pgup and ctrl+pgdown backwards.  Whoops :-)

committer: Tailor Script <tailor@pidgin.im>

diff -r 42c7227d6e4d -r 70816fbc2541 src/gtkconv.c
--- a/src/gtkconv.c	Thu Jan 15 03:43:32 2004 +0000
+++ b/src/gtkconv.c	Thu Jan 15 04:02:12 2004 +0000
@@ -1323,15 +1323,15 @@
 				break;
 
 			case GDK_Page_Up:
-				if (curconv + 1 < numconvs)
-					gaim_conv_window_switch_conversation(win,  curconv + 1);
+				if (curconv > 0)
+					gaim_conv_window_switch_conversation(win, curconv - 1);
 
 				return TRUE;
 				break;
 
 			case GDK_Page_Down:
-				if (curconv > 0)
-					gaim_conv_window_switch_conversation(win, curconv - 1);
+				if (curconv + 1 < numconvs)
+					gaim_conv_window_switch_conversation(win,  curconv + 1);
 
 				return TRUE;
 				break;
@@ -3736,8 +3736,7 @@
 	default_formatize(conv);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD_CHAR);
 	gtk_widget_set_size_request(gtkconv->entry, -1,
-			MAX(gaim_prefs_get_int("/gaim/gtk/conversations/chat/entry_height"),
-				25));
+			gaim_prefs_get_int("/gaim/gtk/conversations/chat/entry_height"));
 	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv);
 
 	g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event",
@@ -3835,8 +3834,7 @@
 	default_formatize(conv);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD_CHAR);
 	gtk_widget_set_size_request(gtkconv->entry, -1,
-			MAX(gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height"),
-				25));
+			gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height"));
 	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv);
 
 	g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event",