debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch MidoriAddons to sokoke_js_script_eval

Browse source
This commit is contained in:
Christian Dywan 2008-12-25 00:43:57 +01:00
parent 0b066778a5
commit c59e040055
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
panels/midori-addons.c
View file

@ -18,7 +18,6 @@
#include "midori-stock.h" #include "midori-stock.h"
#include "sokoke.h" #include "sokoke.h"
#include "gjs.h"
#include <webkit/webkit.h> #include <webkit/webkit.h>
#include <JavaScriptCore/JavaScript.h> #include <JavaScriptCore/JavaScript.h>
@ -790,7 +789,7 @@ _js_script_from_file (JSContextRef js_context,
wrapped_script = g_strdup_printf ( wrapped_script = g_strdup_printf (
"window.addEventListener ('DOMContentLoaded'," "window.addEventListener ('DOMContentLoaded',"
"function () { %s }, true);", script); "function () { %s }, true);", script);
if (gjs_script_eval (js_context, wrapped_script, exception)) if (sokoke_js_script_eval (js_context, wrapped_script, exception))
result = TRUE; result = TRUE;
g_free (wrapped_script); g_free (wrapped_script);
g_free (script); g_free (script);
@ -839,7 +838,7 @@ _js_style_from_file (JSContextRef js_context,
"else document.documentElement.insertBefore(mystyle, document.documentElement.firstChild);" "else document.documentElement.insertBefore(mystyle, document.documentElement.firstChild);"
"}, true);", "}, true);",
style); style);
if (gjs_script_eval (js_context, style_script, exception)) if (sokoke_js_script_eval (js_context, style_script, exception))
result = TRUE; result = TRUE;
g_free (style_script); g_free (style_script);
g_free (style); g_free (style);
@ -892,7 +891,7 @@ midori_web_widget_context_ready_cb (GtkWidget* web_widget,
!_js_script_from_file (js_context, fullname, &exception)) !_js_script_from_file (js_context, fullname, &exception))
{ {
message = g_strdup_printf ("console.error ('%s');", exception); message = g_strdup_printf ("console.error ('%s');", exception);
gjs_script_eval (js_context, message, NULL); sokoke_js_script_eval (js_context, message, NULL);
g_free (message); g_free (message);
g_free (exception); g_free (exception);
} }
@ -900,7 +899,7 @@ midori_web_widget_context_ready_cb (GtkWidget* web_widget,
!_js_style_from_file (js_context, fullname, &exception)) !_js_style_from_file (js_context, fullname, &exception))
{ {
message = g_strdup_printf ("console.error ('%s');", exception); message = g_strdup_printf ("console.error ('%s');", exception);
gjs_script_eval (js_context, message, NULL); sokoke_js_script_eval (js_context, message, NULL);
g_free (message); g_free (message);
g_free (exception); g_free (exception);
} }