Correct conditionals for OS X and JavaScriptCore

diff --git a/midori/main.c b/midori/main.c
index 4de785d105fb339bb33ec4bdeacba2325a3e910a..7466595efcfd79a30877bc1044c0eddf96955b71 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -1839,11 +1839,14 @@ midori_run_script (const gchar* filename)
 
     #ifdef WEBKIT_CHECK_VERSION
     #if WEBKIT_CHECK_VERSION (1, 0, 3)
+    #define HAVE_JSCONTEXTGROUP 1
+    #endif
+    #endif
+    #if HAVE_JSCONTEXTGROUP
     js_context = JSGlobalContextCreateInGroup (NULL, NULL);
     #else
     js_context = JSGlobalContextCreate (NULL);
     #endif
-    #endif
 
     if (g_file_get_contents (filename, &script, NULL, &error))
     {

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 8ac296edd096671b77c7597e4a0c128e7e60b3fb..b825a45951544ba5a255d07ccd58140a30ccc1aa 100644 (file)
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -96,7 +96,7 @@ midori_preferences_init (MidoriPreferences* preferences)
                   "has-separator", FALSE,
                   NULL);
     g_free (dialog_title);
-    #ifndef HAVE_OSX
+    #if !HAVE_OSX
     gtk_dialog_add_buttons (GTK_DIALOG (preferences),
         GTK_STOCK_HELP, GTK_RESPONSE_HELP,
         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,

diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index d9852d4f205d9c3980eeb4820b301f40fb147834..9a45154938ef63f77b7b764f5208ce38b6886c40 100644 (file)
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -1054,7 +1054,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action)
     dialog = gtk_dialog_new_with_buttons (dialog_title,
         toplevel ? GTK_WINDOW (toplevel) : NULL,
         GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-        #ifndef HAVE_OSX
+        #if !HAVE_OSX
         GTK_STOCK_HELP, GTK_RESPONSE_HELP,
         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
         #endif

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 98f0c4572e7ffd2fae4915c32408276403aefaf9..39d6e1759fd3e9dca9e46cddfc5e13bbe874036a 100644 (file)
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -776,7 +776,7 @@ generate_ident_string (MidoriIdentity identify_as)
     #endif
 
     const gchar* os =
-    #if defined (HAVE_OSX)
+    #if HAVE_OSX
     /* #if defined (HAVE_X86) */
     "Intel Mac OS X";
     /* #else