aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2011-08-17 13:11:32 +0200
committerJoakim Verona2011-08-17 13:11:32 +0200
commit296042b2935046f0bad02e4d40a431a6a5804231 (patch)
tree680f50cdda5607f3dc12630e711469afb02ef707 /src
parentad64ea48d79947d4428570eabc139e2f27cfb34e (diff)
downloademacs-296042b2935046f0bad02e4d40a431a6a5804231.tar.gz
emacs-296042b2935046f0bad02e4d40a431a6a5804231.zip
some keyboard event code but it still crashes and now im more fed up
Diffstat (limited to 'src')
-rw-r--r--src/xwidget.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index bc1225e5f61..6bcf49ebd38 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -199,8 +199,8 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
199 /* signals */ 199 /* signals */
200 g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event", G_CALLBACK (webkit_osr_damage_event_callback), NULL); 200 g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event", G_CALLBACK (webkit_osr_damage_event_callback), NULL);
201 201
202 g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "key-press-event", G_CALLBACK (webkit_osr_key_event_callback), NULL); 202 g_signal_connect (G_OBJECT ( xw->widget_osr), "key-press-event", G_CALLBACK (webkit_osr_key_event_callback), NULL);
203 g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "key-release-event", G_CALLBACK (webkit_osr_key_event_callback), NULL); 203 g_signal_connect (G_OBJECT ( xw->widget_osr), "key-release-event", G_CALLBACK (webkit_osr_key_event_callback), NULL);
204 204
205 g_signal_connect (G_OBJECT ( xw->widget_osr), 205 g_signal_connect (G_OBJECT ( xw->widget_osr),
206 "document-load-finished", 206 "document-load-finished",
@@ -397,7 +397,9 @@ gboolean webkit_osr_damage_event_callback (GtkWidget *widget, GdkEventExpose *ev
397gboolean webkit_osr_key_event_callback (GtkWidget *widget, GdkEventKey *event, gpointer data) 397gboolean webkit_osr_key_event_callback (GtkWidget *widget, GdkEventKey *event, gpointer data)
398{ 398{
399 printf("terminating a webkit osr keypress\n"); 399 printf("terminating a webkit osr keypress\n");
400 return FALSE; 400 //TRUE terminate the event here. no paren handlers will be called. but webkit then doesng get the event and it still crashes
401 //FALSE paren handlers will be called. webkit then gets the event and it still crashes
402 return TRUE;
401} 403}
402 404
403 405