Merge branch 'master' of git://git.netsurf-browser.org/netsurf

9 files changed, 161 insertions, 47 deletions

diff --git a/!NetSurf/Resources/it/credits.html,faf b/!NetSurf/Resources/it/credits.html,faf
index bedc2e69c..fe654439e 100644
--- a/!NetSurf/Resources/it/credits.html,faf
+++ b/!NetSurf/Resources/it/credits.html,faf
@@ -17,7 +17,7 @@ div#DevList ul {
 
 <h1>Ringraziamenti</h1>
 
-<p>NetSurf è stato sviluppato per voi dalle seguenti persone:</p>
+<p>NetSurf è stato sviluppato dalle seguenti persone:</p>
 
 <div id="DevList">
 
@@ -91,7 +91,7 @@ div#DevList ul {
 </div>
 
 <div class="footer">
-<p><br>Copyright 2003&ndash;2012 The NetSurf Developers</p>
+<p><br>Copyright 2003&ndash;2013 The NetSurf Developers</p>
 </div>
 
 </body>
diff --git a/!NetSurf/Resources/it/licence.html,faf b/!NetSurf/Resources/it/licence.html,faf
index 3194b3a98..1fa93b39e 100644
--- a/!NetSurf/Resources/it/licence.html,faf
+++ b/!NetSurf/Resources/it/licence.html,faf
@@ -35,7 +35,7 @@ dl.components > dd > span + span {
 
 <h1>Licenza d'uso</h1>
 
-<p style="text-align: justify">Il codice sorgente di NetSurf, la sua documentazione, i file delle traduzioni e le definizioni UI sono rilasciati liberamente secondo i termini della Licenza Pubblica Generica GNU cosi com'è pubblicata dalla Free Software Foundation nella versione 2.0 o successiva, inoltre, come eccezione particolare è possibile collegare il codice sorgente di NetSurf a quello della libreria OpenSSL oppure distribuirli insieme usando una versione modificata della libreria stessa avente però la medesima licenza d'uso.</p>
+<p style="text-align: justify">Il codice sorgente di NetSurf, la sua documentazione, nonchè i file delle traduzioni e le definizioni UI sono rilasciati liberamente secondo i termini della Licenza Pubblica Generica GNU cosi com'è pubblicata dalla Free Software Foundation nella versione 2.0 o successiva, inoltre, come eccezione particolare è possibile collegare il codice sorgente di NetSurf a quello della libreria OpenSSL oppure distribuirli insieme usando una versione modificata della libreria stessa avente però la medesima licenza d'uso.</p>
 
 <p style="text-align: justify">Comunque è necessario rispettare a tutti gli effetti la Licenza Pubblica Generica GNU versione 2.0 per tutte le parti del codice sorgente utilizzato ad eccezione della libreria OpenSSL.</p>
 
@@ -52,25 +52,25 @@ dl.components > dd > span + span {
 <dl class="components">
 <dt><a href="http://www.netsurf-browser.org/">NetSurf</a></dt>
 <dd>
-<span>&copy; 2002&ndash;2012 The NetSurf Developers</span>
+<span>&copy; 2002&ndash;2013 The NetSurf Developers</span>
 <span><a href="#gplv2">GPLv2</a></span>
 </dd>
 
 <dt><a href="http://www.netsurf-browser.org/projects/libcss/">LibCSS</a></dt>
 <dd>
-<span>&copy; 2007&ndash;2012 John-Mark Bell</span>
+<span>&copy; 2007&ndash;2013 John-Mark Bell</span>
 <span><a href="#mit">MIT</a></span>
 </dd>
 
 <dt><a href="http://www.netsurf-browser.org/projects/hubbub/">Hubbub</a></dt>
 <dd>
-<span>&copy; 2007&ndash;2012 John-Mark Bell<br>&copy; 2008&ndash;2009 Andrew Sidwell</span>
+<span>&copy; 2007&ndash;2013 John-Mark Bell<br>&copy; 2008&ndash;2009 Andrew Sidwell</span>
 <span><a href="#mit">MIT</a></span>
 </dd>
 
 <dt><a href="http://www.netsurf-browser.org/projects/libparserutils/">LibParserUtils</a></dt>
 <dd>
-<span>&copy; 2007&ndash;2012 John-Mark Bell</span>
+<span>&copy; 2007&ndash;2013 John-Mark Bell</span>
 <span><a href="#mit">MIT</a></span>
 </dd>
 
@@ -106,7 +106,7 @@ dl.components > dd > span + span {
 
 <dt><a href="http://www.netsurf-browser.org/projects/libnsfb/">Libnsfb</a></dt>
 <dd>
-<span>&copy; 2009&ndash;2012 Vincent Sanders<br>&copy; 2009&ndash;2012 Michael Drake</span>
+<span>&copy; 2009&ndash;2013 Vincent Sanders<br>&copy; 2009&ndash;2013 Michael Drake</span>
 <span><a href="#mit">MIT</a></span>
 </dd>
 
@@ -118,7 +118,7 @@ dl.components > dd > span + span {
 
 <dt><a href="http://www.netsurf-browser.org/projects/libwapcaplet">LibWapcaplet</a></dt>
 <dd>
-<span>&copy; 2009&ndash;2012 NetSurf Browser Project, Daniel Silverstone</span>
+<span>&copy; 2009&ndash;2013 NetSurf Browser Project, Daniel Silverstone</span>
 <span><a href="#mit">MIT</a></span>
 </dd>
 </dl>
@@ -1888,7 +1888,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 </div>
 
 <div class="footer">
-<p>Copyright 2003&ndash;2012 The NetSurf Developers</p>
+<p>Copyright 2003&ndash;2013 The NetSurf Developers</p>
 </div>
 
 </body>
diff --git a/!NetSurf/Resources/it/welcome.html,faf b/!NetSurf/Resources/it/welcome.html,faf
index dd9c63e1b..f936fe3a6 100644
--- a/!NetSurf/Resources/it/welcome.html,faf
+++ b/!NetSurf/Resources/it/welcome.html,faf
@@ -18,7 +18,7 @@
 <div class="onlycontent">
 <h2 class="version">Benvenuti su NetSurf</h2>
 
-<p class="intro">NetSurf è la nostra idea di browser, per questo abbiamo scelto di renderlo piccolo e veloce e stiamo lavorando per renderlo sempre migliore, se hai qualche suggerimento o semplicemente hai bisogno di aiuto contattaci! Grazie per aver scelto NetSurf!</p>
+<p class="intro">NetSurf è la nostra idea di browser, per questo abbiamo scelto di renderlo veloce e sicuro ed ogni giorno lavoriamo per renderlo migliore, se hai qualche suggerimento o semplicemente hai bisogno di aiuto contattaci!<br><br> Grazie per aver scelto NetSurf!</p>
 
 <form method="get" action="http://www.google.it/search">
 <div class="websearch">
diff --git a/amiga/gui.c b/amiga/gui.c
index c5f0aab01..5aadcc501 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3782,21 +3782,63 @@ static void gui_window_update_box_deferred(struct gui_window *g)
 	if(!g) return;
 	if(IsMinListEmpty(g->deferred_rects)) return;
 
+	if(g->deferred == true) {
+		ami_set_pointer(g->shared, GUI_POINTER_WAIT, false);
+	} else {
+		LOG(("Ignoring deferred box redraw queue"));
+	}
+
 	node = (struct nsObject *)GetHead((struct List *)g->deferred_rects);
 
 	do {
 		if(g->deferred == true) {
 			rect = (struct rect *)node->objstruct;
-		
-			ami_do_redraw_limits(g, g->shared->bw, true,
+			ami_do_redraw_limits(g, g->shared->bw, false,
 				rect->x0, rect->y0, rect->x1, rect->y1);
-			}
-
+		}
 		nnode=(struct nsObject *)GetSucc((struct Node *)node);
 		DelObject(node);
 	} while(node = nnode);
 
-	g->deferred = false;
+	if(g->deferred == true) {
+		ami_reset_pointer(g->shared);
+		g->deferred = false;
+	}
+}
+
+static bool gui_window_update_box_deferred_check(struct MinList *deferred_rects,
+				const struct rect *new_rect)
+{
+	struct nsObject *node;
+	struct nsObject *nnode;
+	struct rect *rect;
+	
+	if(IsMinListEmpty(deferred_rects)) return true;
+
+	node = (struct nsObject *)GetHead((struct List *)deferred_rects);
+
+	do {
+		nnode=(struct nsObject *)GetSucc((struct Node *)node);
+		rect = (struct rect *)node->objstruct;
+		
+		if((rect->x0 <= new_rect->x0) &&
+			(rect->y0 <= new_rect->y0) &&
+			(rect->x1 >= new_rect->x1) &&
+			(rect->y1 >= new_rect->y1)) {
+			return false;
+		}
+		
+		if ((new_rect->x0 <= rect->x0) &&
+			(new_rect->y0 <= rect->y0) &&
+			(new_rect->x1 >= rect->x1) &&
+			(new_rect->y1 >= rect->y1)) {
+			LOG(("Removing queued redraw that is a subset of new box redraw"));
+			DelObject(node);
+			/* Don't return - we might find more */
+		}
+	} while(node = nnode);
+
+	return true;
 }
 
 void gui_window_update_box(struct gui_window *g, const struct rect *rect)
@@ -3805,12 +3847,16 @@ void gui_window_update_box(struct gui_window *g, const struct rect *rect)
 	struct rect *deferred_rect;
 	if(!g) return;
 	
-	g->deferred = true;
-	deferred_rect = AllocVec(sizeof(struct rect), MEMF_PRIVATE);
-	CopyMem(rect, deferred_rect, sizeof(struct rect));
+	if(gui_window_update_box_deferred_check(g->deferred_rects, rect)) {
+		g->deferred = true;
+		deferred_rect = AllocVec(sizeof(struct rect), MEMF_PRIVATE);
+		CopyMem(rect, deferred_rect, sizeof(struct rect));
 	
-	nsobj = AddObject(g->deferred_rects, AMINS_RECT);
-	nsobj->objstruct = deferred_rect;
+		nsobj = AddObject(g->deferred_rects, AMINS_RECT);
+		nsobj->objstruct = deferred_rect;
+	} else {
+		LOG(("Ignoring duplicate or subset of queued box redraw"));
+	}
 }
 
 void ami_do_redraw(struct gui_window_2 *gwin)
diff --git a/amiga/tree.c b/amiga/tree.c
index b19cd203e..cbaef836e 100755
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -513,8 +513,8 @@ void ami_tree_open(struct treeview_window *twin,int type)
 		case AMI_TREE_SSLCERT:
 			twin->wintitle = ami_utf8_easy((char *)messages_get("SSLCerts"));
 			twin->sslerr = ami_utf8_easy((char *)messages_get("SSLError"));
-			twin->sslaccept = ami_utf8_easy((char *)messages_get("Accept"));
-			twin->sslreject = ami_utf8_easy((char *)messages_get("Reject"));
+			twin->sslaccept = ami_utf8_easy((char *)messages_get("SSL_Certificate_Accept"));
+			twin->sslreject = ami_utf8_easy((char *)messages_get("SSL_Certificate_Reject"));
 		break;
 	}
 
diff --git a/javascript/jsapi/htmldocument.bnd b/javascript/jsapi/htmldocument.bnd
index 4aacccf4e..6e7f56528 100644
--- a/javascript/jsapi/htmldocument.bnd
+++ b/javascript/jsapi/htmldocument.bnd
@@ -76,8 +76,7 @@ getter location %{
 	jsret = jsapi_new_Location(cx,
 				   NULL,
 				   NULL,
-				   llcache_handle_get_url(private->htmlc->base.llcache),
-				   private->htmlc);
+				   llcache_handle_get_url(private->htmlc->base.llcache));
 %}
 
 getter URL %{
diff --git a/javascript/jsapi/location.bnd b/javascript/jsapi/location.bnd
index 7fa12d4c4..03687ba18 100644
--- a/javascript/jsapi/location.bnd
+++ b/javascript/jsapi/location.bnd
@@ -26,6 +26,8 @@ preamble %{
 
 #include "location.h"
 
+struct browser_window *jsapi_get_browser_window(JSContext *cx);
+
 %}
 
 binding location {
@@ -34,16 +36,50 @@ binding location {
 	interface Location; /* Web IDL interface to generate */
 
 	private "nsurl *" url;
-	private "struct html_content *" htmlc; 
 
 	property unshared href;
 
 }
 
 operation reload %{
-	browser_window_reload(private->htmlc->bw, false);
+	struct browser_window *bw;
+	bw = jsapi_get_browser_window(cx);
+	if (bw != NULL) {
+		browser_window_reload(bw, false);
+	} else {
+		JSLOG("failed to get browser context");
+	}
+%}
+
+/* void Location::assign(DOMString url); */
+operation assign %{
+	nsurl *joined;
+	struct browser_window *bw;
+
+	bw = jsapi_get_browser_window(cx);
+	if (bw != NULL) {
+		nsurl_join(private->url, url, &joined);
+		browser_window_go(bw, nsurl_access(joined), NULL, true);
+		nsurl_unref(joined);
+	} else {
+		JSLOG("failed to get browser context");
+	}
 %}
 
+/* void Location::replace(DOMString url); */
+operation replace %{
+	nsurl *joined;
+	struct browser_window *bw;
+
+	bw = jsapi_get_browser_window(cx);
+	if (bw != NULL) {
+		nsurl_join(private->url, url, &joined);
+		browser_window_go(bw, nsurl_access(joined), NULL, false);
+		nsurl_unref(joined);
+	} else {
+		JSLOG("failed to get browser context");
+	}
+%}
 
 getter href %{
 	char *url_s = NULL;
@@ -65,13 +101,25 @@ setter href %{
 	JSString *url_jsstr = NULL;
 	int url_len = 0;
 	char *url = NULL;
+	struct browser_window *bw;
+	nsurl *joined;
+
+	bw = jsapi_get_browser_window(cx);
+
+	if (bw != NULL) {
+		url_jsstr = JS_ValueToString(cx, *vp);
+		if (url_jsstr != NULL) {
+			JSString_to_char(url_jsstr, url, url_len);
+
+			nsurl_join(private->url, url, &joined);
 
-	url_jsstr = JS_ValueToString(cx, *vp);
-	if (url_jsstr != NULL) {
-		JSString_to_char(url_jsstr, url, url_len);
-		browser_window_go(private->htmlc->bw, url, NULL, false);
+			browser_window_go(bw, nsurl_access(joined), NULL, false);
+			nsurl_unref(joined);
+		} else {
+			JSLOG("failed to convert string value");
+		}
 	} else {
-		JSLOG("failed to convert string value");
+		JSLOG("failed to get browser context");
 	}
 %}
 
diff --git a/javascript/jsapi/window.bnd b/javascript/jsapi/window.bnd
index bba1eb7db..b334cc7cc 100644
--- a/javascript/jsapi/window.bnd
+++ b/javascript/jsapi/window.bnd
@@ -40,6 +40,27 @@ preamble %{
 #include "window.h"
 #include "location.h"
 
+struct browser_window *jsapi_get_browser_window(JSContext *cx);
+
+%}
+
+prologue %{
+
+struct browser_window *jsapi_get_browser_window(JSContext *cx)
+{
+	struct jsclass_private *private;
+
+	private = JS_GetInstancePrivate(cx,
+					JS_GetGlobalObject(cx),
+					&JSClass_Window,
+					NULL);
+	if (private != NULL) {
+		return private->bw;
+	}
+
+	return NULL;
+}
+
 %}
 
 binding window {
diff --git a/resources/FatMessages b/resources/FatMessages
index 4abd8479e..047432a3a 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -39,11 +39,11 @@ de.all.NetSurf:NetSurf
 fr.all.NetSurf:NetSurf
 it.all.NetSurf:NetSurf
 nl.all.NetSurf:NetSurf
-en.all.NetSurfCopyright:Copyright © 2003 - 2012 The NetSurf Developers
-de.all.NetSurfCopyright:Copyright © 2003 - 2012 The NetSurf Developers
-fr.all.NetSurfCopyright:Copyright © 2003 - 2012 The NetSurf Developers
-it.all.NetSurfCopyright:Copyright © 2003 - 2012 The NetSurf Developers
-nl.all.NetSurfCopyright:Copyright © 2003 - 2012 The NetSurf Developers
+en.all.NetSurfCopyright:Copyright © 2003 - 2013 The NetSurf Developers
+de.all.NetSurfCopyright:Copyright © 2003 - 2013 The NetSurf Developers
+fr.all.NetSurfCopyright:Copyright © 2003 - 2013 The NetSurf Developers
+it.all.NetSurfCopyright:Copyright © 2003 - 2013 The NetSurf Developers
+nl.all.NetSurfCopyright:Copyright © 2003 - 2013 The NetSurf Developers
 
 # Menus
 # =====
@@ -325,12 +325,12 @@ nl.all.OptDefault:Als standaard instellen
 en.all.ForeImg:Foreground images
 de.all.ForeImg:Vordergrundbilder
 fr.all.ForeImg:Images de premier plan
-it.all.ForeImg:Immagini in primo piano
+it.all.ForeImg:In primo piano
 nl.all.ForeImg:Voorgrondafbeelding
 en.all.BackImg:Background images
 de.all.BackImg:Hintergrundbilder
 fr.all.BackImg:Images de fond
-it.all.BackImg:Immagini in sottofondo
+it.all.BackImg:In sottofondo
 nl.all.BackImg:Achtergrondafbeelding
 
 # Main -> Display -> Toolbars menu
@@ -402,12 +402,12 @@ nl.all.Window:Venster
 en.all.HotlistAdd:Add to hotlist
 de.all.HotlistAdd:Eintrag hinzufügen
 fr.all.HotlistAdd:Ajouter aux favoris
-it.all.HotlistAdd:Aggiungi ai segnalibri
+it.all.HotlistAdd:Aggiungi
 nl.all.HotlistAdd:Toevoegen aan bladwijzers
 en.all.HotlistShow:Show hotlist...  F6
 de.all.HotlistShow:Hotlist zeigen...  F6
 fr.all.HotlistShow:Montrer les favoris...  F6
-it.all.HotlistShow:Mostra segnalibri...  F6
+it.all.HotlistShow:Mostra...  F6
 nl.all.HotlistShow:Toon bladwijzers  F6
 
 # Main -> Utilities -> History menu
@@ -818,7 +818,7 @@ nl.all.ClearNS:Clear selection
 en.all.Browser:Browser
 de.all.Browser:Browser
 fr.all.Browser:Browser
-it.all.Browser:Visualizza
+it.all.Browser:Strumenti
 nl.all.Browser:Browser
 en.all.HistGlobalNS:Show global history...
 de.all.HistGlobalNS:Zeige globale History...
@@ -1823,12 +1823,12 @@ nl.gtk.gtkImages:_Images
 en.gtk.gtkForegroundImages:_Foreground Images
 de.gtk.gtkForegroundImages:_Vordergrundbilder
 fr.gtk.gtkForegroundImages:_Images de premier plan
-it.gtk.gtkForegroundImages:Immagini in _primo piano
+it.gtk.gtkForegroundImages:In _primo piano
 nl.gtk.gtkForegroundImages:_Foreground Images
 en.gtk.gtkBackgroundImages:_Background Images
 de.gtk.gtkBackgroundImages:_Hintergrundbilder
 fr.gtk.gtkBackgroundImages:_Images d'arrière plan
-it.gtk.gtkBackgroundImages:Immagini in _sottofondo
+it.gtk.gtkBackgroundImages:In _sottofondo
 nl.gtk.gtkBackgroundImages:_Background Images
 en.gtk.gtkToolbars:_Toolbars
 de.gtk.gtkToolbars:_Werkzeugleisten
@@ -2196,12 +2196,12 @@ nl.all.SSLCerts:SSL certificates
 en.all.SSLError:NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below.
 de.all.SSLError:NetSurf konnte ein SSL Zertifikat nicht prüfen. Bitte die Details unten beachten.
 fr.all.SSLError:NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below.
-it.all.SSLError:NetSurf non è stato in grado di verificare l'autenticità di questo certificato SSL, per favore verifica i dettagli presenti di seguito.
+it.all.SSLError:NetSurf non è stato in grado di verificare l'autenticità di questo certificato SSL, per favore verifica i dettagli presenti di seguito
 nl.all.SSLError:NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below.
 en.all.SSL_Certificate_Subject:Subject: %s
 de.all.SSL_Certificate_Subject:Subject: %s
 fr.all.SSL_Certificate_Subject:Subject: %s
-it.all.SSL_Certificate_Subject:Oggetto: %s
+it.all.SSL_Certificate_Subject:Soggetto: %s
 nl.all.SSL_Certificate_Subject:Subject: %s
 en.all.SSL_Certificate_Issuer:Issuer: %s
 de.all.SSL_Certificate_Issuer:Issuer: %s
@@ -5622,7 +5622,7 @@ nl.all.SearchProvider:Search provider
 en.ami.OptionDocky:Show in AmiDock
 de.ami.OptionDocky:In AmiDock zeigen
 fr.ami.OptionDocky:Show in AmiDock
-it.ami.OptionDocky:Mostra icona su AmiDock
+it.ami.OptionDocky:Mostra icona di NetSurf su AmiDock
 nl.ami.OptionDocky:Show in AmiDock
 en.all.Clipboard:Clipboard
 de.all.Clipboard:Clipboard