From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 20 Jul 2009 21:27:06 +0000 (+0200)
Subject: Fix warnings about HAVE_JSCORE not being defined
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3201370b60f7eda4dd207b96913fe0722f5d86ef;p=midori

Fix warnings about HAVE_JSCORE not being defined
---

diff --git a/midori/main.c b/midori/main.c
index 7b61bfcf..6ed70b6a 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1335,7 +1335,7 @@ midori_load_session (gpointer data)
     return FALSE;
 }
 
-#if HAVE_JSCORE
+#ifdef HAVE_JSCORE
 static gint
 midori_run_script (const gchar* filename)
 {
@@ -1435,7 +1435,7 @@ 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") },
-       #if HAVE_JSCORE
+       #ifdef HAVE_JSCORE
        { "run", 'r', 0, G_OPTION_ARG_NONE, &run,
        N_("Run the specified filename as javascript"), NULL },
        #endif
@@ -1589,7 +1589,7 @@ main (int    argc,
         return 0;
     }
 
-    #if HAVE_JSCORE
+    #ifdef HAVE_JSCORE
     /* Standalone javascript support */
     if (run)
         return midori_run_script (uris ? *uris : NULL);
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 194657f4..97d932f2 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -36,7 +36,7 @@
     #include <idna.h>
 #endif
 
-#if HAVE_JSCORE
+#ifdef HAVE_JSCORE
 static gchar*
 sokoke_js_string_utf8 (JSStringRef js_string)
 {
@@ -57,7 +57,7 @@ sokoke_js_script_eval (JSContextRef js_context,
                        const gchar* script,
                        gchar**      exception)
 {
-    #if HAVE_JSCORE
+    #ifdef HAVE_JSCORE
     gchar* value;
     JSStringRef js_value_string;
     #endif
@@ -65,7 +65,7 @@ sokoke_js_script_eval (JSContextRef js_context,
     g_return_val_if_fail (js_context, FALSE);
     g_return_val_if_fail (script, FALSE);
 
-    #if HAVE_JSCORE
+    #ifdef HAVE_JSCORE
     JSStringRef js_script = JSStringCreateWithUTF8CString (script);
     JSValueRef js_exception = NULL;
     JSValueRef js_value = JSEvaluateScript (js_context, js_script,
@@ -100,8 +100,6 @@ error_dialog (const gchar* short_message,
     gtk_widget_show (dialog);
     g_signal_connect_swapped (dialog, "response",
                               G_CALLBACK (gtk_widget_destroy), dialog);
-
-
 }
 
 /**