diff options
| -rw-r--r-- | !NetSurf/!Run,feb | 4 | ||||
| -rw-r--r-- | !NetSurf/Resources/AdBlock,f79 | 1 | ||||
| -rw-r--r-- | makefile | 6 | ||||
| -rw-r--r-- | riscos/window.c | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb index cf809c4b4..d312fcb21 100644 --- a/!NetSurf/!Run,feb +++ b/!NetSurf/!Run,feb @@ -1,4 +1,4 @@ -| Run file for NetSurf. ( $Revision: 1.45 $ ) +| Run file for NetSurf. ( $Revision: 1.46 $ ) | | This file ensures that the system resources required by NetSurf are | present. Additionally, it forces setting of system variables related @@ -84,5 +84,5 @@ Unset Alias$NetSurfRMLoad CDir <Wimp$ScrapDir>.WWW CDir <Wimp$ScrapDir>.WWW.NetSurf -WimpSlot -min 2240k -max 2240k +WimpSlot -min 3100k -max 3100k Run <NetSurf$Dir>.!RunImage %*0 2><Wimp$ScrapDir>.WWW.NetSurf.Log
\ No newline at end of file diff --git a/!NetSurf/Resources/AdBlock,f79 b/!NetSurf/Resources/AdBlock,f79 index b695fc76a..eaf1d484e 100644 --- a/!NetSurf/Resources/AdBlock,f79 +++ b/!NetSurf/Resources/AdBlock,f79 @@ -131,7 +131,6 @@ object[id="widgeth"], *[style*="/ads/"], *[id*="popover_"], *[src*="120x80"], -*[src*="140x"], *[src*="?ad"], *[src*="-ad-"], *[src*="/adimage"], @@ -35,7 +35,7 @@ OBJECTS_RISCOS += 401login.o artworks.o assert.o awrender.o bitmap.o \ buffer.o configure.o debugwin.o \ dialog.o download.o draw.o filename.o filetype.o font.o \ global_history.o gui.o help.o history.o hotlist.o image.o \ - menus.o message.o mouseactions.o plotters.o plugin.o print.o \ + menus.o message.o plotters.o plugin.o print.o \ query.o save.o save_complete.o save_draw.o save_text.o \ schedule.o search.o sprite.o textselection.o theme.o \ theme_install.o thumbnail.o treeview.o ucstables.o uri.o \ @@ -85,7 +85,7 @@ OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o) # Inclusion of platform specific files has to occur after the OBJDIR stuff as # that is refered to in the files -OS = $(word 2,$(subst -, ,$(shell /usr/bin/gcc -dumpmachine))) +OS = $(word 2,$(subst -, ,$(shell gcc -dumpmachine))) ifeq ($(OS),riscos) include riscos.mk else @@ -180,7 +180,7 @@ utils/translit.c: transtab # available), remove */*.[ch] from the line below. # Under RISC OS, you may require *Set UnixFS$sfix "", if perl gives # "No such file or directory" errors. -depend: */*.[ch] +depend: @echo "--> modified files $?" @echo "--> updating dependencies" @-mkdir -p $(OBJDIR_RISCOS) $(OBJDIR_NCOS) $(OBJDIR_DEBUG) $(OBJDIR_GTK) diff --git a/riscos/window.c b/riscos/window.c index e0da79b3f..b03fd585f 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1179,7 +1179,7 @@ void ro_gui_window_open(struct gui_window *g, wimp_open *open) } if ((state.flags & wimp_WINDOW_TOGGLED) && // bit 19 (state.flags & wimp_WINDOW_BOUNDED_ONCE) && // bit 21 - !(state.flags & wimp_WINDOW_FULL_SIZE)) { // not bit 18 + (state.flags & wimp_WINDOW_FULL_SIZE)) { // not bit 18 ro_gui_screen_size(&screen_width, &screen_height); /* i can see no way of easily discovering if we were the result of a shift- * toggle as wimp_WINDOW_PARTIAL_SIZE does not seem to be what we need. As |