diff options
| author | Ricardo Wurmus | 2016-10-25 23:00:35 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-10-25 23:07:13 -0700 |
| commit | 67e03311a0b9091fe98a2cca86c6a6a933fc6e05 (patch) | |
| tree | a3d15b7bcee18012967abe79db3835a0317f279d /src | |
| parent | 8809002052c1154d38ce392198525945da674777 (diff) | |
| download | emacs-67e03311a0b9091fe98a2cca86c6a6a933fc6e05.tar.gz emacs-67e03311a0b9091fe98a2cca86c6a6a933fc6e05.zip | |
xwidget: Remove title hack.
* src/xwidget.c (xwidget-webkit-get-title): Remove procedure.
* lisp/xwidget.el (xwidget-webkit-get-title,
xwidget-webkit-execute-script-rv): Remove procedures.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xwidget.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index 8552810636e..dbd8fc18ad7 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -709,27 +709,6 @@ argument procedure FUN.*/) | |||
| 709 | return Qnil; | 709 | return Qnil; |
| 710 | } | 710 | } |
| 711 | 711 | ||
| 712 | DEFUN ("xwidget-webkit-get-title", | ||
| 713 | Fxwidget_webkit_get_title, Sxwidget_webkit_get_title, | ||
| 714 | 1, 1, 0, | ||
| 715 | doc: /* Return the title from the Webkit instance in XWIDGET. | ||
| 716 | This can be used to work around the lack of a return value from the | ||
| 717 | exec method. */ ) | ||
| 718 | (Lisp_Object xwidget) | ||
| 719 | { | ||
| 720 | /* TODO support multibyte strings. */ | ||
| 721 | WEBKIT_FN_INIT (); | ||
| 722 | const gchar *str = | ||
| 723 | webkit_web_view_get_title (WEBKIT_WEB_VIEW (xw->widget_osr)); | ||
| 724 | if (str == 0) | ||
| 725 | { | ||
| 726 | /* TODO maybe return Qnil instead. I suppose webkit returns | ||
| 727 | null pointer when doc is not properly loaded or something. */ | ||
| 728 | return build_string (""); | ||
| 729 | } | ||
| 730 | return build_string (str); | ||
| 731 | } | ||
| 732 | |||
| 733 | DEFUN ("xwidget-resize", Fxwidget_resize, Sxwidget_resize, 3, 3, 0, | 712 | DEFUN ("xwidget-resize", Fxwidget_resize, Sxwidget_resize, 3, 3, 0, |
| 734 | doc: /* Resize XWIDGET. NEW_WIDTH, NEW_HEIGHT define the new size. */ ) | 713 | doc: /* Resize XWIDGET. NEW_WIDTH, NEW_HEIGHT define the new size. */ ) |
| 735 | (Lisp_Object xwidget, Lisp_Object new_width, Lisp_Object new_height) | 714 | (Lisp_Object xwidget, Lisp_Object new_width, Lisp_Object new_height) |
| @@ -975,7 +954,6 @@ syms_of_xwidget (void) | |||
| 975 | 954 | ||
| 976 | defsubr (&Sxwidget_webkit_goto_uri); | 955 | defsubr (&Sxwidget_webkit_goto_uri); |
| 977 | defsubr (&Sxwidget_webkit_execute_script); | 956 | defsubr (&Sxwidget_webkit_execute_script); |
| 978 | defsubr (&Sxwidget_webkit_get_title); | ||
| 979 | DEFSYM (Qwebkit, "webkit"); | 957 | DEFSYM (Qwebkit, "webkit"); |
| 980 | 958 | ||
| 981 | defsubr (&Sxwidget_size_request); | 959 | defsubr (&Sxwidget_size_request); |