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

Correct conditionals for OS X and JavaScriptCore

Browse source
This commit is contained in:
Christian Dywan 2009-01-10 20:13:08 +01:00
parent 4a59af2c5f
commit 4ad55618f6
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
midori/main.c
View file

@ -1839,11 +1839,14 @@ midori_run_script (const gchar* filename)
#ifdef WEBKIT_CHECK_VERSION #ifdef WEBKIT_CHECK_VERSION
#if WEBKIT_CHECK_VERSION (1, 0, 3) #if WEBKIT_CHECK_VERSION (1, 0, 3)
#define HAVE_JSCONTEXTGROUP 1
#endif
#endif
#if HAVE_JSCONTEXTGROUP
js_context = JSGlobalContextCreateInGroup (NULL, NULL); js_context = JSGlobalContextCreateInGroup (NULL, NULL);
#else #else
js_context = JSGlobalContextCreate (NULL); js_context = JSGlobalContextCreate (NULL);
#endif #endif
#endif
if (g_file_get_contents (filename, &script, NULL, &error)) if (g_file_get_contents (filename, &script, NULL, &error))
{ {

2
midori/midori-preferences.c
View file

@ -96,7 +96,7 @@ midori_preferences_init (MidoriPreferences* preferences)
"has-separator", FALSE, "has-separator", FALSE,
NULL); NULL);
g_free (dialog_title); g_free (dialog_title);
#ifndef HAVE_OSX #if !HAVE_OSX
gtk_dialog_add_buttons (GTK_DIALOG (preferences), gtk_dialog_add_buttons (GTK_DIALOG (preferences),
GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_HELP, GTK_RESPONSE_HELP,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,

2
midori/midori-searchaction.c
View file

@ -1054,7 +1054,7 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action)
dialog = gtk_dialog_new_with_buttons (dialog_title, dialog = gtk_dialog_new_with_buttons (dialog_title,
toplevel ? GTK_WINDOW (toplevel) : NULL, toplevel ? GTK_WINDOW (toplevel) : NULL,
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
#ifndef HAVE_OSX #if !HAVE_OSX
GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_HELP, GTK_RESPONSE_HELP,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
#endif #endif

2
midori/midori-websettings.c
View file

@ -776,7 +776,7 @@ generate_ident_string (MidoriIdentity identify_as)
#endif #endif
const gchar* os = const gchar* os =
#if defined (HAVE_OSX) #if HAVE_OSX
/* #if defined (HAVE_X86) */ /* #if defined (HAVE_X86) */
"Intel Mac OS X"; "Intel Mac OS X";
/* #else /* #else