aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2011-07-18 22:45:22 +0200
committerJoakim Verona2011-07-18 22:45:22 +0200
commitd202b5a0bae129aff4af5db194603e055d29440c (patch)
tree0e147433430bf9882b5a29262cb6aa13303a8e68 /src
parentcd1f21dd9e794a14aa6907296c6ee95cc5f693a1 (diff)
downloademacs-d202b5a0bae129aff4af5db194603e055d29440c.tar.gz
emacs-d202b5a0bae129aff4af5db194603e055d29440c.zip
support for disabling plugins(flash is undesirable) in webkit
Diffstat (limited to 'src')
-rw-r--r--src/xwidget.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index 263e8553ca9..c75f9bbd83e 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -93,6 +93,9 @@
93 93
94#ifdef HAVE_WEBKIT_OSR 94#ifdef HAVE_WEBKIT_OSR
95#include <webkit/webkitwebview.h> 95#include <webkit/webkitwebview.h>
96#include <webkit/webkitwebplugindatabase.h>
97#include <webkit/webkitwebplugin.h>
98#include <webkit/webkitglobals.h>
96#endif 99#endif
97 100
98#include "xwidget.h" 101#include "xwidget.h"
@@ -808,7 +811,18 @@ DEFUN("xwidget-delete-zombies", Fxwidget_delete_zombies , Sxwidget_delete_zombie
808 } 811 }
809} 812}
810 813
811 814DEFUN("xwidget-disable-plugin-for-mime", Fxwidget_disable_plugin_for_mime , Sxwidget_disable_plugin_for_mime, 1,1,0, doc: /* */)
815 (Lisp_Object mime)
816{
817 WebKitWebPlugin *wp = webkit_web_plugin_database_get_plugin_for_mimetype
818 (webkit_get_web_plugin_database(), SDATA(mime));
819 if(wp == NULL) return Qnil;
820 if(webkit_web_plugin_get_enabled (wp)){
821 webkit_web_plugin_set_enabled (wp, FALSE);
822 return Qt;
823 }
824 return Qnil;
825}
812 826
813void 827void
814syms_of_xwidget (void) 828syms_of_xwidget (void)
@@ -827,6 +841,7 @@ syms_of_xwidget (void)
827 defsubr (&Sxwidget_webkit_get_title); 841 defsubr (&Sxwidget_webkit_get_title);
828 defsubr (&Sxwidget_size_request ); 842 defsubr (&Sxwidget_size_request );
829 defsubr (&Sxwidget_delete_zombies); 843 defsubr (&Sxwidget_delete_zombies);
844 defsubr (&Sxwidget_disable_plugin_for_mime);
830 DEFSYM (Qxwidget ,"xwidget"); 845 DEFSYM (Qxwidget ,"xwidget");
831 846
832 DEFSYM (Qcxwidget ,":xwidget"); 847 DEFSYM (Qcxwidget ,":xwidget");