backoutmerge

This commit is contained in:
Enno Boland (Gottox) 2009-06-08 09:31:29 +02:00
commit f287155cb9

12
surf.c
View file

@ -186,7 +186,7 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
return FALSE;
}
}
else if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
if(ev->state == GDK_CONTROL_MASK || ev->state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
switch(ev->keyval) {
case GDK_r:
case GDK_R:
@ -211,16 +211,6 @@ keypress(GtkWidget* w, GdkEventKey *ev, gpointer d) {
return TRUE;
}
}
else {
switch(ev->keyval) {
case GDK_k:
webkit_web_view_move_cursor(c->view, GTK_MOVEMENT_DISPLAY_LINES, -1);
return TRUE;
case GDK_j:
webkit_web_view_move_cursor(c->view, GTK_MOVEMENT_DISPLAY_LINES, 1);
return TRUE;
}
}
return FALSE;
}