Correct conditionals for OS X and JavaScriptCore

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))
     {

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,

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

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