mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-26 22:09:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2006-01-26 23:38:22 by tlsa]

Browse Source 
Remove rule.netsurf/!NetSurf/Resources/AdBlock,f79

svn path=/import/netsurf/; revision=2046
This commit is contained in:
Michael Drake 2006-01-26 23:38:23 +00:00
parent 5ed9d58a24
commit cea6db4ee0
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
!NetSurf/!Run,feb
View File

@ -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

1
!NetSurf/Resources/AdBlock,f79
View File

@ -131,7 +131,6 @@ object[id="widgeth"],
*[style*="/ads/"],
*[id*="popover_"],
*[src*="120x80"],
*[src*="140x"],
*[src*="?ad"],
*[src*="-ad-"],
*[src*="/adimage"],

6
makefile
View File

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

2
riscos/window.c
View File

@ -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