summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2010-05-03 20:49:15 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2010-05-03 20:49:15 +0000
commit77aa68dde5989b9ab543ce4bbebdd147f83050cc (patch)
treeb48fc6a0f3bd658e57ba86677156874062ad8799
parent048249f71d337274ce8cf1bcf698f700599f701d (diff)
downloadnetsurf-77aa68dde5989b9ab543ce4bbebdd147f83050cc.tar.gz
netsurf-77aa68dde5989b9ab543ce4bbebdd147f83050cc.tar.bz2
Purge parserutils
svn path=/trunk/netsurf/; revision=10547
-rwxr-xr-xamiga/clipboard.c7
-rwxr-xr-xamiga/utf8.c5
2 files changed, 7 insertions, 5 deletions
diff --git a/amiga/clipboard.c b/amiga/clipboard.c
index a2dc926d0..04198c984 100755
--- a/amiga/clipboard.c
+++ b/amiga/clipboard.c
@@ -17,7 +17,6 @@
*/
#include "desktop/gui.h"
-#include <parserutils/charset/mibenum.h>
#include "amiga/iff_cset.h"
#include <proto/iffparse.h>
#include <datatypes/textclass.h>
@@ -31,6 +30,8 @@
#include <proto/datatypes.h>
#include "amiga/bitmap.h"
#include "amiga/iff_dr2d.h"
+#include <proto/diskfont.h>
+#include <diskfont/diskfonttag.h>
struct IFFHandle *iffh = NULL;
@@ -93,7 +94,9 @@ void gui_paste_from_clipboard(struct gui_window *g, int x, int y)
}
else
{
- utf8_from_enc(readbuf,parserutils_charset_mibenum_to_name(cset.CodeSet),rlen,&clip);
+ utf8_from_enc(readbuf,
+ ObtainCharsetInfo(DFCS_NUMBER, cset.CodeSet, DFCS_MIMENAME),
+ rlen, &clip);
}
browser_window_paste_text(g->shared->bw,clip,rlen,true);
diff --git a/amiga/utf8.c b/amiga/utf8.c
index 648736c01..bb94c6390 100755
--- a/amiga/utf8.c
+++ b/amiga/utf8.c
@@ -19,7 +19,6 @@
#include <sys/types.h>
#include "utils/utf8.h"
#include <proto/exec.h>
-#include <parserutils/charset/mibenum.h>
#include <proto/diskfont.h>
#include <diskfont/diskfonttag.h>
@@ -30,7 +29,7 @@ utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len,
char *encname;
charset = GetDiskFontCtrl(DFCTRL_CHARSET);
- encname = parserutils_charset_mibenum_to_name(charset);
+ encname = ObtainCharsetInfo(DFCS_NUMBER, charset, DFCS_MIMENAME);
return utf8_to_enc(string,encname,len,result);
}
@@ -75,7 +74,7 @@ utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len,
char *encname;
charset = GetDiskFontCtrl(DFCTRL_CHARSET);
- encname = parserutils_charset_mibenum_to_name(charset);
+ encname = ObtainCharsetInfo(DFCS_NUMBER, charset, DFCS_MIMENAME);
return utf8_from_enc(string,encname,len,result);
}