# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1034301163 0
# Node ID 468dc12b5ee8ced5303f368f70b66033668cb091
# Parent  cff64d67e3d7835729be64bb10b385a96824292c
[gaim-migrate @ 3749]
apparently i wasn't up to date

committer: Tailor Script <tailor@pidgin.im>

diff -r cff64d67e3d7 -r 468dc12b5ee8 src/conversation.c
--- a/src/conversation.c	Fri Oct 11 01:47:27 2002 +0000
+++ b/src/conversation.c	Fri Oct 11 01:52:43 2002 +0000
@@ -846,10 +846,12 @@
 		}
 	} else if (event->keyval == GDK_Page_Up) {
 		gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
-		gtk_imhtml_page_up(GTK_IMHTML(c->text));
+		if(!(event->state & GDK_CONTROL_MASK))
+			gtk_imhtml_page_up(GTK_IMHTML(c->text));
 	} else if (event->keyval == GDK_Page_Down) {
 		gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
-		gtk_imhtml_page_down(GTK_IMHTML(c->text));
+		if(!(event->state & GDK_CONTROL_MASK))
+			gtk_imhtml_page_down(GTK_IMHTML(c->text));
 	} else if ((event->keyval == GDK_F2) && (convo_options & OPT_CONVO_F2_TOGGLES)) {
 		gtk_imhtml_show_comments(GTK_IMHTML(c->text), !GTK_IMHTML(c->text)->comments);
 	} else if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter)) {