diff options
| author | Joakim Verona | 2011-11-03 14:58:05 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-11-03 14:58:05 +0100 |
| commit | fe118e06d872fd1149a273282cb082250346e89f (patch) | |
| tree | dcc20533851158dd0457f093918f95bc02d0f79f /src | |
| parent | 1722eccee3d963c08d91afcdeebdc152d867e7bf (diff) | |
| download | emacs-fe118e06d872fd1149a273282cb082250346e89f.tar.gz emacs-fe118e06d872fd1149a273282cb082250346e89f.zip | |
attempt to make relative urls work, but it doesnt. contains some bugfixes anyway
Diffstat (limited to 'src')
| -rw-r--r-- | src/xwidget.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index 2c87959b21d..848e95fca1a 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -462,7 +462,7 @@ void store_xwidget_event_string(struct xwidget* xw, char* eventname,char* events | |||
| 462 | event.frame_or_window = Qnil; //frame; //how to get the frame here? //TODO i store it in the xwidget now | 462 | event.frame_or_window = Qnil; //frame; //how to get the frame here? //TODO i store it in the xwidget now |
| 463 | 463 | ||
| 464 | event.arg = Qnil; | 464 | event.arg = Qnil; |
| 465 | event.arg = Fcons (intern (eventstr), event.arg); //intern? | 465 | event.arg = Fcons (build_string(eventstr), event.arg); //string so dont intern |
| 466 | event.arg = Fcons ((Lisp_Object)xw, event.arg); //TODO | 466 | event.arg = Fcons ((Lisp_Object)xw, event.arg); //TODO |
| 467 | event.arg = Fcons (intern (eventname), event.arg);//interning should be ok | 467 | event.arg = Fcons (intern (eventname), event.arg);//interning should be ok |
| 468 | kbd_buffer_store_event (&event); | 468 | kbd_buffer_store_event (&event); |
| @@ -479,8 +479,8 @@ void webkit_osr_document_load_finished_callback (WebKitWebView *webkitwebvi | |||
| 479 | struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (webkitwebview), XG_XWIDGET); | 479 | struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (webkitwebview), XG_XWIDGET); |
| 480 | printf("webkit finished loading\n"); | 480 | printf("webkit finished loading\n"); |
| 481 | 481 | ||
| 482 | store_xwidget_event_string(xw, "", | 482 | store_xwidget_event_string(xw, |
| 483 | "document-load-finished"); | 483 | "document-load-finished", ""); |
| 484 | } | 484 | } |
| 485 | 485 | ||
| 486 | gboolean webkit_osr_download_callback (WebKitWebView *webkitwebview, | 486 | gboolean webkit_osr_download_callback (WebKitWebView *webkitwebview, |
| @@ -494,7 +494,7 @@ gboolean webkit_osr_download_callback (WebKitWebView *webkitwebview, | |||
| 494 | struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (webkitwebview), XG_XWIDGET); | 494 | struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (webkitwebview), XG_XWIDGET); |
| 495 | printf("webkit finished loading\n"); | 495 | printf("webkit finished loading\n"); |
| 496 | 496 | ||
| 497 | store_xwidget_event_string(xw, webkit_download_get_uri (arg1), "download-requested"); | 497 | store_xwidget_event_string(xw, "download-requested", webkit_download_get_uri (arg1)); |
| 498 | 498 | ||
| 499 | return FALSE; | 499 | return FALSE; |
| 500 | } | 500 | } |
| @@ -529,8 +529,8 @@ gboolean webkit_osr_new_window_policy_decision_requested_callback(WebKitWebView | |||
| 529 | printf("webkit_osr_new_window_policy_decision_requested_callback %s\n", | 529 | printf("webkit_osr_new_window_policy_decision_requested_callback %s\n", |
| 530 | webkit_web_navigation_action_get_original_uri (navigation_action)); | 530 | webkit_web_navigation_action_get_original_uri (navigation_action)); |
| 531 | 531 | ||
| 532 | store_xwidget_event_string(xw, webkit_web_navigation_action_get_original_uri (navigation_action), | 532 | store_xwidget_event_string(xw, "new-window-policy-decision-requested", webkit_web_navigation_action_get_original_uri (navigation_action) |
| 533 | "new-window-policy-decision-requested"); | 533 | ); |
| 534 | return FALSE; | 534 | return FALSE; |
| 535 | } | 535 | } |
| 536 | 536 | ||
| @@ -544,8 +544,8 @@ gboolean webkit_osr_navigation_policy_decision_requested_callback(WebKitWebView | |||
| 544 | struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (webView), XG_XWIDGET); | 544 | struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (webView), XG_XWIDGET); |
| 545 | printf("webkit_osr_navigation_policy_decision_requested_callback %s\n", | 545 | printf("webkit_osr_navigation_policy_decision_requested_callback %s\n", |
| 546 | webkit_web_navigation_action_get_original_uri (navigation_action)); | 546 | webkit_web_navigation_action_get_original_uri (navigation_action)); |
| 547 | store_xwidget_event_string(xw, webkit_web_navigation_action_get_original_uri (navigation_action), | 547 | store_xwidget_event_string(xw, "navigation-policy-decision-requested", webkit_web_navigation_action_get_original_uri (navigation_action) |
| 548 | "navigation-policy-decision-requested"); | 548 | ); |
| 549 | return FALSE; | 549 | return FALSE; |
| 550 | } | 550 | } |
| 551 | 551 | ||