gaim/gaim

and sync this tree as well
gtk1-stable
2002-10-10, Luke Schierer
330c9d58c2ce
Parents ab82a75d820c
Children c1b7d5833523
and sync this tree as well
--- a/src/conversation.c Mon Oct 07 16:12:56 2002 -0400
+++ b/src/conversation.c Thu Oct 10 20:54:24 2002 -0400
@@ -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)) {