diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-09-02 17:31:47 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-09-02 17:31:47 +0000 |
| commit | 25fea2721df52567999bd9aaf3dd5046c350450e (patch) | |
| tree | e2755845cb552b687456b0337761eeb29112830b /amiga/gui_options.c | |
| parent | a7d4f08b77245cc66ace55e60032b194e1c9db13 (diff) | |
| download | netsurf-25fea2721df52567999bd9aaf3dd5046c350450e.tar.gz netsurf-25fea2721df52567999bd9aaf3dd5046c350450e.tar.bz2 | |
Avoid calling AllocSignal() until the last minute, as it causes PM_OPEN to initiate
an Intuition or Input deadlock.
Re-enable context menus as they are now safe.
Remove sticky context menus option as this can be set in GUI prefs as a global option.
svn path=/trunk/netsurf/; revision=12698
Diffstat (limited to 'amiga/gui_options.c')
| -rwxr-xr-x | amiga/gui_options.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 0f453439f..0c64c9baf 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -118,7 +118,6 @@ enum GID_OPTS_SEARCH_PROV, GID_OPTS_CLIPBOARD, GID_OPTS_CMENU_ENABLE, - GID_OPTS_CMENU_STICKY, GID_OPTS_STARTUP_NO_WIN, GID_OPTS_CLOSE_NO_QUIT, GID_OPTS_DOCKY, @@ -285,7 +284,6 @@ void ami_gui_opts_setup(void) gadlab[GID_OPTS_SEARCH_PROV] = (char *)ami_utf8_easy((char *)messages_get("SearchProvider")); gadlab[GID_OPTS_CLIPBOARD] = (char *)ami_utf8_easy((char *)messages_get("ClipboardUTF8")); gadlab[GID_OPTS_CMENU_ENABLE] = (char *)ami_utf8_easy((char *)messages_get("Enable")); - gadlab[GID_OPTS_CMENU_STICKY] = (char *)ami_utf8_easy((char *)messages_get("Sticky")); gadlab[GID_OPTS_STARTUP_NO_WIN] = (char *)ami_utf8_easy((char *)messages_get("OptionNoWindow")); gadlab[GID_OPTS_CLOSE_NO_QUIT] = (char *)ami_utf8_easy((char *)messages_get("OptionNoQuit")); gadlab[GID_OPTS_DOCKY] = (char *)ami_utf8_easy((char *)messages_get("OptionDocky")); @@ -1137,13 +1135,6 @@ void ami_gui_opts_open(void) GA_Text, gadlab[GID_OPTS_CMENU_ENABLE], GA_Selected, option_context_menu, CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_CMENU_STICKY] = CheckBoxObject, - GA_ID, GID_OPTS_CMENU_STICKY, - GA_RelVerify, TRUE, - GA_Disabled, !option_context_menu, - GA_Text, gadlab[GID_OPTS_CMENU_STICKY], - GA_Selected, option_sticky_context_menu, - CheckBoxEnd, LayoutEnd, // context menus CHILD_WeightedHeight, 0, LayoutEnd, // temp extra group for spacing @@ -1594,10 +1585,6 @@ void ami_gui_opts_use(void) if(data) option_context_menu = true; else option_context_menu = false; - GetAttr(GA_Selected,gow->objects[GID_OPTS_CMENU_STICKY],(ULONG *)&data); - if(data) option_sticky_context_menu = true; - else option_sticky_context_menu = false; - GetAttr(GA_Selected,gow->objects[GID_OPTS_STARTUP_NO_WIN],(ULONG *)&data); if(data) option_startup_no_window = true; else option_startup_no_window = false; @@ -1829,11 +1816,6 @@ BOOL ami_gui_opts_event(void) IDoMethod(gow->objects[GID_OPTS_DLDIR], GFILE_REQUEST,gow->win); break; - - case GID_OPTS_CMENU_ENABLE: - RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_CMENU_STICKY], - gow->win, NULL, GA_Disabled, !code, TAG_DONE); - break; } break; } |