Mercurial > pidgin.yaz
changeset 3626:468dc12b5ee8
[gaim-migrate @ 3749]
apparently i wasn't up to date
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Fri, 11 Oct 2002 01:52:43 +0000 |
parents | cff64d67e3d7 |
children | 639411e6a4cd |
files | src/conversation.c |
diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)) {