From 0fafa9576e8963928c13c81524e64b624b794c98 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Mon, 2 Jan 2017 15:02:32 +0000
Subject: make the window title text common

---
 frontends/amiga/corewindow.c |  4 ++++
 frontends/amiga/corewindow.h |  3 +++
 frontends/amiga/sslcert.c    | 14 ++++++--------
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'frontends/amiga')

diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c
index db42775bb..024e768b9 100644
--- a/frontends/amiga/corewindow.c
+++ b/frontends/amiga/corewindow.c
@@ -60,6 +60,7 @@
 #include "amiga/misc.h"
 #include "amiga/object.h"
 #include "amiga/schedule.h"
+#include "amiga/utf8.h"
 
 /**
  * Convert co-ordinates relative to space.gadget
@@ -665,6 +666,9 @@ nserror ami_corewindow_fini(struct ami_corewindow *ami_cw)
 	ami_plot_release_pens(ami_cw->gg.shared_pens);
 	ami_free_layers(&ami_cw->gg);
 
+	/* free the window title */
+	ami_utf8_free(ami_cw->wintitle);
+
 	/* remove the core window from our window list */
 	ami_gui_win_list_remove(ami_cw);
 
diff --git a/frontends/amiga/corewindow.h b/frontends/amiga/corewindow.h
index 2c5dbb5cf..42c0f0367 100644
--- a/frontends/amiga/corewindow.h
+++ b/frontends/amiga/corewindow.h
@@ -57,6 +57,9 @@ struct ami_corewindow {
 		APTR deferred_rects_pool;
 		struct MinList *deferred_rects;
 
+		/** window title, must be allocated wth ami_utf8 function */
+		char *wintitle;
+
 		/** stuff for our off-screen render bitmap */
 		struct gui_globals gg;
 		struct MinList *shared_pens;
diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c
index c1b9ae288..b3d57efeb 100644
--- a/frontends/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
@@ -64,7 +64,6 @@ struct ami_crtvrfy_window {
 	/** Amiga GUI stuff */
 	Object *sslcert_objects[GID_SSLCERT_LAST]; // technically wasting a few bytes here
 
-	char *wintitle;
 	char *sslerr;
 	char *sslaccept;
 	char *sslreject;
@@ -83,7 +82,6 @@ ami_crtvrfy_destroy(struct ami_crtvrfy_window *crtvrfy_win)
 
 	res = sslcert_viewer_fini(crtvrfy_win->ssl_data);
 	if (res == NSERROR_OK) {
-		ami_utf8_free(crtvrfy_win->wintitle);
 		ami_utf8_free(crtvrfy_win->sslerr);
 		ami_utf8_free(crtvrfy_win->sslaccept);
 		ami_utf8_free(crtvrfy_win->sslreject);
@@ -217,7 +215,7 @@ ami_crtvrfy_create_window(struct ami_crtvrfy_window *crtvrfy_win)
 
 	ami_cw->objects[GID_CW_WIN] = WindowObj,
   	    WA_ScreenTitle, ami_gui_get_screen_title(),
-       	WA_Title, crtvrfy_win->wintitle,
+       	WA_Title, ami_cw->wintitle,
        	WA_Activate, TRUE,
        	WA_DepthGadget, TRUE,
        	WA_DragBar, TRUE,
@@ -287,7 +285,7 @@ nserror ami_cert_verify(struct nsurl *url,
 		return NSERROR_NOMEM;
 	}
 
-	ncwin->wintitle = ami_utf8_easy((char *)messages_get("SSLCerts"));
+	ncwin->core.wintitle = ami_utf8_easy((char *)messages_get("SSLCerts"));
 	ncwin->sslerr = ami_utf8_easy((char *)messages_get("SSLError"));
 	ncwin->sslaccept = ami_utf8_easy((char *)messages_get("SSL_Certificate_Accept"));
 	ncwin->sslreject = ami_utf8_easy((char *)messages_get("SSL_Certificate_Reject"));
@@ -295,7 +293,7 @@ nserror ami_cert_verify(struct nsurl *url,
 	res = ami_crtvrfy_create_window(ncwin);
 	if (res != NSERROR_OK) {
 		LOG("SSL UI builder init failed");
-		ami_utf8_free(ncwin->wintitle);
+		ami_utf8_free(ncwin->core.wintitle);
 		ami_utf8_free(ncwin->sslerr);
 		ami_utf8_free(ncwin->sslaccept);
 		ami_utf8_free(ncwin->sslreject);
@@ -312,7 +310,7 @@ nserror ami_cert_verify(struct nsurl *url,
 
 	res = ami_corewindow_init(&ncwin->core);
 	if (res != NSERROR_OK) {
-		ami_utf8_free(ncwin->wintitle);
+		ami_utf8_free(ncwin->core.wintitle);
 		ami_utf8_free(ncwin->sslerr);
 		ami_utf8_free(ncwin->sslaccept);
 		ami_utf8_free(ncwin->sslreject);
@@ -325,7 +323,7 @@ nserror ami_cert_verify(struct nsurl *url,
 	res = sslcert_viewer_create_session_data(num, url, cb, cbpw, certs,
 									   &ncwin->ssl_data);
 	if (res != NSERROR_OK) {
-		ami_utf8_free(ncwin->wintitle);
+		ami_utf8_free(ncwin->core.wintitle);
 		ami_utf8_free(ncwin->sslerr);
 		ami_utf8_free(ncwin->sslaccept);
 		ami_utf8_free(ncwin->sslreject);
@@ -338,7 +336,7 @@ nserror ami_cert_verify(struct nsurl *url,
 							  (struct core_window *)ncwin,
 							  ncwin->ssl_data);
 	if (res != NSERROR_OK) {
-		ami_utf8_free(ncwin->wintitle);
+		ami_utf8_free(ncwin->core.wintitle);
 		ami_utf8_free(ncwin->sslerr);
 		ami_utf8_free(ncwin->sslaccept);
 		ami_utf8_free(ncwin->sslreject);
-- 
cgit v1.2.3