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

Fix running standalone javascripts

Browse source
This commit is contained in:
Christian Dywan 2008-09-30 20:17:20 +02:00
parent b41c13b8fa
commit 353533c8a7
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
midori/main.c
View file

@ -538,6 +538,8 @@ main (int argc,
}; };
GtkWidget* view; GtkWidget* view;
GtkWidget* plug; GtkWidget* plug;
JSGlobalContextRef js_context;
gchar* exception;
MidoriStartup load_on_startup; MidoriStartup load_on_startup;
gchar* homepage; gchar* homepage;
KatzeArray* search_engines; KatzeArray* search_engines;
@ -601,15 +603,15 @@ main (int argc,
} }
/* Standalone gjs support */ /* Standalone gjs support */
if (argc > 1 && argv[1] && g_str_has_suffix (argv[1], ".js")) if (uris && uris[0] && g_str_has_suffix (uris[0], ".js"))
{ {
JSGlobalContextRef js_context = gjs_global_context_new (); js_context = gjs_global_context_new ();
gchar* exception = NULL; exception = NULL;
gjs_script_from_file (js_context, argv[1], &exception); gjs_script_from_file (js_context, uris[0], &exception);
JSGlobalContextRelease (js_context); JSGlobalContextRelease (js_context);
if (!exception) if (!exception)
return 0; return 0;
printf ("%s - Exception: %s\n", argv[1], exception); printf ("%s - Exception: %s\n", uris[0], exception);
return 1; return 1;
} }
@ -823,7 +825,7 @@ main (int argc,
(GWeakNotify)(midori_browser_weak_notify_cb), browser); (GWeakNotify)(midori_browser_weak_notify_cb), browser);
/* Load extensions */ /* Load extensions */
JSGlobalContextRef js_context = gjs_global_context_new (); js_context = gjs_global_context_new ();
/* FIXME: We want to honor system installed addons as well */ /* FIXME: We want to honor system installed addons as well */
gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, gchar* addon_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME,
"extensions", NULL); "extensions", NULL);