From 9bd355e30c1f6aa57d42fe4f2fa6e9f521f002a4 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 2 Jan 2014 18:50:59 +0000 Subject: Convert download filename to local charset --- amiga/Makefile.target | 2 +- amiga/download.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'amiga') diff --git a/amiga/Makefile.target b/amiga/Makefile.target index da9b252c9..484c57dcb 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -109,7 +109,7 @@ AMIGA_LIBRARIES := parserutils.library nsgif.library nsbmp.library iconv.library AMIGA_LIBS := $(addprefix /Libs/,$(AMIGA_LIBRARIES)) AMIGA_SHARED_OBJS := libjpeg.so.12 libcurl.so.7 librtmp.so.0 libsvgtiny.so.0 \ libssl.so.1.0.0 libcrypto.so.1.0.0 libcss.so.0 libwapcaplet.so.0 libpng12.so \ - libdom.so.0 libhubbub.so.0 libtre.so.5 libintl.so + libdom.so.0 libhubbub.so.0 libtre.so.5 libintl.so libparserutils.so.0 AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS)) AMIGA_DISTRIBUTION_FILES := amiga/dist/* AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga diff --git a/amiga/download.c b/amiga/download.c index 52baedb24..d33b723d1 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -92,6 +92,7 @@ struct gui_download_window *gui_download_window_create(download_context *ctx, const char *mime_type = download_context_get_mime_type(ctx); unsigned long total_size = download_context_get_total_length(ctx); struct gui_download_window *dw; + char *dl_filename = ami_utf8_easy(download_context_get_filename(ctx)); APTR va[3]; dw = AllocVecTags(sizeof(struct gui_download_window), AVT_ClearWithValue, 0, TAG_DONE); @@ -107,9 +108,9 @@ struct gui_download_window *gui_download_window_create(download_context *ctx, if(AslRequestTags(savereq, ASLFR_Window, gui->shared->win, ASLFR_SleepWindow, TRUE, - ASLFR_TitleText,messages_get("NetSurf"), - ASLFR_Screen,scrn, - ASLFR_InitialFile, download_context_get_filename(ctx), + ASLFR_TitleText, messages_get("NetSurf"), + ASLFR_Screen, scrn, + ASLFR_InitialFile, dl_filename, TAG_DONE)) { strlcpy(dw->fname, savereq->fr_Drawer, 1024); @@ -127,6 +128,7 @@ struct gui_download_window *gui_download_window_create(download_context *ctx, } } + if(dl_filename) ami_utf8_free(dl_filename); dw->size = total_size; dw->downloaded = 0; if(gui) dw->bw = gui->shared->bw; -- cgit v1.2.3