diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-06-15 17:40:36 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-06-15 17:40:36 +0000 |
commit | a7c9fbfa04391367f0817acf9de8a7c9b21bf834 (patch) | |
tree | 063c599e229c3856b0333572aee113411c2f2ef8 /amiga | |
parent | dd99b8a461d1aa814f9ad54537c92e2e248dcf1e (diff) | |
download | netsurf-a7c9fbfa04391367f0817acf9de8a7c9b21bf834.tar.gz netsurf-a7c9fbfa04391367f0817acf9de8a7c9b21bf834.tar.bz2 |
remove no_iframes
svn path=/trunk/netsurf/; revision=12482
Diffstat (limited to 'amiga')
-rwxr-xr-x | amiga/dist/NetSurf.guide | 1 | ||||
-rwxr-xr-x | amiga/gui.c | 2 | ||||
-rw-r--r-- | amiga/options.h | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide index 2824334a8..0010277c9 100755 --- a/amiga/dist/NetSurf.guide +++ b/amiga/dist/NetSurf.guide @@ -40,7 +40,6 @@ The options file is stored in @{"Resources/Options" link Resources/Options/Main} There are a couple of Amiga-specific options which can only be changed directly in the file. These are: @{b}kiosk_mode@{ub} No gadgets -@{b}no_iframes@{ub} Disable IFrames @{b}printer_unit@{ub} Specifies which printer.device unit to print to @{b}drag_save_icons@{ub} Enables displaying Workbench-style transparent icons under the pointer when performing drag saves (ctrl-drag of objects available if NetSurf is running on the Workbench screen) and text selection drags. If set to 0 the pointer style will change instead. OS 4.0 users may want to set this to 0 as icons will appear opaque and obscure the drop position. @{b}cairo_renderer@{ub} Set rendering engine (SObjs version only). 0 = graphics.library, 1 = Cairo/graphics.library mixed (recommended), 2 = Full Cairo. diff --git a/amiga/gui.c b/amiga/gui.c index a73d18db1..5facb71d9 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2335,8 +2335,6 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, char addtab[100],addtab_s[100],addtab_g[100]; char tabthrobber[100]; - if((bw->browser_window_type == BROWSER_WINDOW_IFRAME) && option_no_iframes) return NULL; - if(!scrn) ami_openscreenfirst(); if(option_kiosk_mode) new_tab = false; diff --git a/amiga/options.h b/amiga/options.h index e463c32d9..eda3fbee7 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -26,7 +26,6 @@ extern char *option_use_pubscreen; extern char *option_modeid; extern int option_cache_bitmaps; extern char *option_theme; -extern bool option_no_iframes; extern bool option_utf8_clipboard; extern bool option_context_menu; extern bool option_sticky_context_menu; @@ -74,7 +73,6 @@ char *option_use_pubscreen = 0; \ char *option_modeid = 0; \ int option_cache_bitmaps = 0; \ char *option_theme = 0; \ -bool option_no_iframes = true; \ bool option_utf8_clipboard = false; \ bool option_context_menu = true; \ bool option_sticky_context_menu = false; \ @@ -122,7 +120,6 @@ int option_amiga_ydpi = 72; \ { "screen_modeid", OPTION_STRING, &option_modeid}, \ { "cache_bitmaps", OPTION_INTEGER, &option_cache_bitmaps}, \ { "theme", OPTION_STRING, &option_theme}, \ -{ "no_iframes", OPTION_BOOL, &option_no_iframes}, \ { "clipboard_write_utf8", OPTION_BOOL, &option_utf8_clipboard}, \ { "context_menu", OPTION_BOOL, &option_context_menu}, \ { "sticky_context_menu", OPTION_BOOL, &option_sticky_context_menu}, \ |