[Gaim-commits] CVS: gaim/src conversation.c,1.386,1.387

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv9323/src

Modified Files:
	conversation.c 
Log Message:
apparently i wasn't up to date


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -d -r1.386 -r1.387
--- conversation.c	9 Oct 2002 05:45:19 -0000	1.386
+++ conversation.c	11 Oct 2002 01:52:43 -0000	1.387
@@ -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)) {