Remove HAVE_JSCORE so javascripts work again

diff --git a/midori/main.c b/midori/main.c
index 6ed70b6ac386b509b74e4bb4fd9eae9c18cab611..128d8ddf9e6668bd3e5d948bbbed399978f7dc05 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -1335,7 +1335,6 @@ midori_load_session (gpointer data)
     return FALSE;
 }
 
-#ifdef HAVE_JSCORE
 static gint
 midori_run_script (const gchar* filename)
 {
@@ -1373,7 +1372,6 @@ midori_run_script (const gchar* filename)
     g_print ("%s - Exception: %s\n", filename, exception);
     return 1;
 }
-#endif
 
 #if WEBKIT_CHECK_VERSION (1, 1, 6)
 static void
@@ -1435,10 +1433,8 @@ main (int    argc,
        N_("Run ADDRESS as a web application"), N_("ADDRESS") },
        { "config", 'c', 0, G_OPTION_ARG_FILENAME, &config,
        N_("Use FOLDER as configuration folder"), N_("FOLDER") },
-       #ifdef HAVE_JSCORE
        { "run", 'r', 0, G_OPTION_ARG_NONE, &run,
        N_("Run the specified filename as javascript"), NULL },
-       #endif
        #if WEBKIT_CHECK_VERSION (1, 1, 6)
        { "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot,
        N_("Take a snapshot of the specified URI"), NULL },
@@ -1589,11 +1585,9 @@ main (int    argc,
         return 0;
     }
 
-    #ifdef HAVE_JSCORE
     /* Standalone javascript support */
     if (run)
         return midori_run_script (uris ? *uris : NULL);
-    #endif
 
     #if HAVE_HILDON
     osso_context = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL);

diff --git a/midori/sokoke.c b/midori/sokoke.c
index abe482def97790a009ef8bae5f500b8a71cdbf1d..17abbde2ce458701b02d8c2e7e8355a167162732 100644 (file)
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -36,7 +36,6 @@
     #include <idna.h>
 #endif
 
-#ifdef HAVE_JSCORE
 static gchar*
 sokoke_js_string_utf8 (JSStringRef js_string)
 {
@@ -50,22 +49,18 @@ sokoke_js_string_utf8 (JSStringRef js_string)
     JSStringGetUTF8CString (js_string, string_utf8, size_utf8);
     return string_utf8;
 }
-#endif
 
 gchar*
 sokoke_js_script_eval (JSContextRef js_context,
                        const gchar* script,
                        gchar**      exception)
 {
-    #ifdef HAVE_JSCORE
     gchar* value;
     JSStringRef js_value_string;
-    #endif
 
     g_return_val_if_fail (js_context, FALSE);
     g_return_val_if_fail (script, FALSE);
 
-    #ifdef HAVE_JSCORE
     JSStringRef js_script = JSStringCreateWithUTF8CString (script);
     JSValueRef js_exception = NULL;
     JSValueRef js_value = JSEvaluateScript (js_context, js_script,
@@ -84,9 +79,6 @@ sokoke_js_script_eval (JSContextRef js_context,
     value = sokoke_js_string_utf8 (js_value_string);
     JSStringRelease (js_value_string);
     return value;
-    #else
-    return g_strdup ("");
-    #endif
 }
 
 static void