[Gaim-commits] CVS: gaim/src conversation.c,1.358.2.4,1.358.2.5

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

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

Modified Files:
      Tag: gtk1-stable
	conversation.c 
Log Message:
and sync this tree as well


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.358.2.4
retrieving revision 1.358.2.5
diff -u -d -r1.358.2.4 -r1.358.2.5
--- conversation.c	21 Sep 2002 20:03:43 -0000	1.358.2.4
+++ conversation.c	11 Oct 2002 00:54:24 -0000	1.358.2.5
@@ -837,10 +837,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)) {