diff options
| author | Joakim Verona | 2012-09-28 10:01:27 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-09-28 10:01:27 +0200 |
| commit | 5fcc7035c884b4419a1619551222b5f28ad9906f (patch) | |
| tree | 8b85fa0b18603b47383794afd2607a2edc97dd99 /src/xwidget.c | |
| parent | be25526e5384268a6a834e701a194626ecc3ca53 (diff) | |
| parent | 5bc93c6718562a9819b4919b595281bf85689306 (diff) | |
| download | emacs-5fcc7035c884b4419a1619551222b5f28ad9906f.tar.gz emacs-5fcc7035c884b4419a1619551222b5f28ad9906f.zip | |
finally builds again
Diffstat (limited to 'src/xwidget.c')
| -rw-r--r-- | src/xwidget.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index d7cda79ea90..22993df3a91 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -217,7 +217,7 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0, | |||
| 217 | */ | 217 | */ |
| 218 | if (EQ(xw->type, Qwebkit_osr)){ | 218 | if (EQ(xw->type, Qwebkit_osr)){ |
| 219 | printf("init webkit osr\n"); | 219 | printf("init webkit osr\n"); |
| 220 | BLOCK_INPUT; | 220 | block_input(); |
| 221 | xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ()); | 221 | xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ()); |
| 222 | gtk_window_resize( GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); | 222 | gtk_window_resize( GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); |
| 223 | xw->widget_osr = webkit_web_view_new(); | 223 | xw->widget_osr = webkit_web_view_new(); |
| @@ -264,14 +264,14 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0, | |||
| 264 | 264 | ||
| 265 | 265 | ||
| 266 | webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org"); | 266 | webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org"); |
| 267 | UNBLOCK_INPUT; | 267 | unblock_input(); |
| 268 | 268 | ||
| 269 | } | 269 | } |
| 270 | #endif | 270 | #endif |
| 271 | 271 | ||
| 272 | if (EQ(xw->type, Qsocket_osr)){ | 272 | if (EQ(xw->type, Qsocket_osr)){ |
| 273 | printf("init socket osr\n"); | 273 | printf("init socket osr\n"); |
| 274 | BLOCK_INPUT; | 274 | block_input(); |
| 275 | xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ()); | 275 | xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ()); |
| 276 | gtk_window_resize( GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); | 276 | gtk_window_resize( GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); |
| 277 | 277 | ||
| @@ -293,7 +293,7 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0, | |||
| 293 | g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event", G_CALLBACK (webkit_osr_damage_event_callback), NULL); | 293 | g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event", G_CALLBACK (webkit_osr_damage_event_callback), NULL); |
| 294 | 294 | ||
| 295 | //webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org"); | 295 | //webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org"); |
| 296 | UNBLOCK_INPUT; | 296 | unblock_input(); |
| 297 | 297 | ||
| 298 | } | 298 | } |
| 299 | 299 | ||