Update to 1.3.3, and some patches to make it compile again with newer

gtkhtml.
Changes:
- The message bar was always shown, even if the preferences setting
  was not.
- If the locale is set to Chinese, Japanese, or Korean, menus would
  be shown in the locale's language, but the actual text itself did
  not (Mitsuo Hamada).
- Changes to some preferences would never be saved (Ian M Laurie).

6 files changed, 93 insertions, 5 deletions

diff --git a/editors/gnotepad/Makefile b/editors/gnotepad/Makefile
index 90313d311b0..ac9b4b6923e 100644
--- a/editors/gnotepad/Makefile
+++ b/editors/gnotepad/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2001/04/02 20:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/04/22 17:16:42 wiz Exp $
 
-DISTNAME=	gnotepad+-1.3.2
+DISTNAME=	gnotepad+-1.3.3
 PKGNAME=	${DISTNAME:S/+//}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnotepad/}
diff --git a/editors/gnotepad/distinfo b/editors/gnotepad/distinfo
index 096e22ea161..779f9f24525 100644
--- a/editors/gnotepad/distinfo
+++ b/editors/gnotepad/distinfo
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/22 17:16:42 wiz Exp $
 
-SHA1 (gnotepad+-1.3.2.tar.gz) = 47c86fbe5a270959f8c4189fd0626b56841fc794
-Size (gnotepad+-1.3.2.tar.gz) = 461377 bytes
+SHA1 (gnotepad+-1.3.3.tar.gz) = 58cb0e2b557e901502fd4a89b5d80c9d2c340b74
+Size (gnotepad+-1.3.3.tar.gz) = 461837 bytes
+SHA1 (patch-aa) = a8fa1f0eff13285d784690044ccb0290ea49f985
+SHA1 (patch-ab) = eab47270dadd9031d795de6c5cc1a87d5f3db719
+SHA1 (patch-ac) = 4a3ebba265238deda0584b5fef53c84ef923bde7
+SHA1 (patch-ad) = d47f0ebc3e874c5ef8801253bb2059b32f80fa13
diff --git a/editors/gnotepad/patches/patch-aa b/editors/gnotepad/patches/patch-aa
new file mode 100644
index 00000000000..dddabdc50ac
--- /dev/null
+++ b/editors/gnotepad/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2001/04/22 17:16:43 wiz Exp $
+
+--- src/doc.c.orig	Tue Apr 25 07:11:22 2000
++++ src/doc.c
+@@ -1037,7 +1037,7 @@
+ #endif
+ #ifdef USE_GTKHTML
+ 	case DocGtkHtml:
+-		d->data = gtk_html_new(NULL, NULL);
++		d->data = gtk_html_new();
+ 		gtk_signal_connect(GTK_OBJECT(d->data), "url_requested",
+ 				   GTK_SIGNAL_FUNC(html_view_url_requested),
+ 				   NULL);
diff --git a/editors/gnotepad/patches/patch-ab b/editors/gnotepad/patches/patch-ab
new file mode 100644
index 00000000000..8030b23df2f
--- /dev/null
+++ b/editors/gnotepad/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2001/04/22 17:16:44 wiz Exp $
+
+--- src/file.c.orig	Wed Jun  7 02:19:45 2000
++++ src/file.c
+@@ -241,8 +241,8 @@
+ #endif
+ #ifdef USE_GTKHTML
+ 		else if (GTK_IS_HTML(d->data)) {
+-			gtk_html_begin(GTK_HTML(d->data), d->fname);
+-			gtk_html_parse(GTK_HTML(d->data));
++			gtk_html_begin(GTK_HTML(d->data));
++			html_engine_parse(GTK_HTML(d->data));
+ 		}
+ #endif
+ 	} /* filesize > 0 */
diff --git a/editors/gnotepad/patches/patch-ac b/editors/gnotepad/patches/patch-ac
new file mode 100644
index 00000000000..185cc88bead
--- /dev/null
+++ b/editors/gnotepad/patches/patch-ac
@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.1 2001/04/22 17:16:44 wiz Exp $
+
+--- src/htmlview.c.orig	Sat Apr  1 21:03:56 2000
++++ src/htmlview.c
+@@ -215,7 +215,7 @@
+ #ifdef USE_GTKHTML
+ void
+ html_view_url_requested(GtkHTML *html, const char *url,
+-			GtkHTMLStreamHandle handle, gpointer cbdata)
++			GtkHTMLStream *handle, gpointer cbdata)
+ {
+ 	FILE *fp;
+ 	int nread;
+@@ -290,7 +290,7 @@
+ 		gtk_box_pack_start(GTK_BOX(GTK_DIALOG(toplev)->vbox), tmp,
+ 				   TRUE, TRUE, 10);
+ 
+-		html = gtk_html_new(NULL, NULL);
++		html = gtk_html_new();
+ 		gtk_signal_connect(GTK_OBJECT(html), "url_requested",
+ 				   GTK_SIGNAL_FUNC(html_view_url_requested),
+ 				   NULL);
+@@ -314,8 +314,8 @@
+ 
+ #ifdef USE_GTKHTML
+ 	if (hviewtype == HtmlViewGtkHtml) {
+-		gtk_html_begin(GTK_HTML(html), fname);
+-		gtk_html_parse(GTK_HTML(html));
++		gtk_html_begin(GTK_HTML(html));
++		html_engine_parse(GTK_HTML(html));
+ 	}
+ #endif
+ } /* html_view_in_new_win_by_text */
diff --git a/editors/gnotepad/patches/patch-ad b/editors/gnotepad/patches/patch-ad
new file mode 100644
index 00000000000..54e5b30902d
--- /dev/null
+++ b/editors/gnotepad/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2001/04/22 17:16:44 wiz Exp $
+
+--- src/htmlview.h.orig	Sat Dec 11 04:14:04 1999
++++ src/htmlview.h
+@@ -27,6 +27,9 @@
+ #include <stdio.h>
+ #include "main.h"
+ #include "doc.h"
++#ifdef USE_GTKHTML
++#include <gtkhtml/gtkhtml.h>
++#endif
+ 
+ typedef enum {
+ 	HtmlViewXmHtml,
+@@ -47,7 +50,7 @@
+ #endif
+ #ifdef USE_GTKHTML
+ extern void html_view_url_requested(GtkHTML *html, const char *url,
+-				    GtkHTMLStreamHandle handle, gpointer);
++				    GtkHTMLStream *handle, gpointer);
+ #endif
+ 
+ #ifdef __cplusplus