netsurf: branch master updated. release/3.0-136-g83ab7ac

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Tue May 28 17:08:16 BST 2013


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/83ab7accf4cb82f8acd995c551d94f3faef6ab2d
...commit http://git.netsurf-browser.org/netsurf.git/commit/83ab7accf4cb82f8acd995c551d94f3faef6ab2d
...tree http://git.netsurf-browser.org/netsurf.git/tree/83ab7accf4cb82f8acd995c551d94f3faef6ab2d

The branch, master has been updated
       via  83ab7accf4cb82f8acd995c551d94f3faef6ab2d (commit)
      from  b918f63f3ee64ff9f5a60afcdb6be14656969e8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=83ab7accf4cb82f8acd995c551d94f3faef6ab2d
commit 83ab7accf4cb82f8acd995c551d94f3faef6ab2d
Author: Vincent Sanders <vince at kyllikki.org>
Commit: Vincent Sanders <vince at kyllikki.org>

    fix stupid mistake introduced in options API change

diff --git a/amiga/gui.c b/amiga/gui.c
index de6b64e..d36914e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -418,14 +418,14 @@ ami_colour_option_from_pen(struct nsoption_s *opts,
 			if(pen == AMINS_SCROLLERPEN) pen = ami_system_colour_scrollbar_fgpen(drinfo);
 
 			/* Get the colour of the pen being used for "pen" */
-			GetRGB32(screen->ViewPort.ColorMap, drinfo->dri_Pens[pen], 1, (ULONG *)&colour);
+			GetRGB32(scrn->ViewPort.ColorMap, drinfo->dri_Pens[pen], 1, (ULONG *)&colour);
 
 			/* convert it to a color */
 			def_colour = ((colour[0] & 0xff000000) >> 24) |
 				((colour[1] & 0xff000000) >> 16) |
 				((colour[2] & 0xff000000) >> 8);
 
-			FreeScreenDrawInfo(screen, drinfo);
+			FreeScreenDrawInfo(scrn, drinfo);
 		}
 	}
 


-----------------------------------------------------------------------

Summary of changes:
 amiga/gui.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/amiga/gui.c b/amiga/gui.c
index de6b64e..d36914e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -418,14 +418,14 @@ ami_colour_option_from_pen(struct nsoption_s *opts,
 			if(pen == AMINS_SCROLLERPEN) pen = ami_system_colour_scrollbar_fgpen(drinfo);
 
 			/* Get the colour of the pen being used for "pen" */
-			GetRGB32(screen->ViewPort.ColorMap, drinfo->dri_Pens[pen], 1, (ULONG *)&colour);
+			GetRGB32(scrn->ViewPort.ColorMap, drinfo->dri_Pens[pen], 1, (ULONG *)&colour);
 
 			/* convert it to a color */
 			def_colour = ((colour[0] & 0xff000000) >> 24) |
 				((colour[1] & 0xff000000) >> 16) |
 				((colour[2] & 0xff000000) >> 8);
 
-			FreeScreenDrawInfo(screen, drinfo);
+			FreeScreenDrawInfo(scrn, drinfo);
 		}
 	}
 


-- 
NetSurf Browser



More information about the netsurf-commits mailing list