summaryrefslogtreecommitdiff
path: root/amiga/misc.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2010-12-30 00:48:09 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2010-12-30 00:48:09 +0000
commit8a2247b3b38aff43ffe076acbb0674abbee2489b (patch)
tree8f12e1815994ea965e1e38ba7fb368903f8fffb1 /amiga/misc.c
parent27b00696a3a8c5465a5b462871ba76031574505c (diff)
downloadnetsurf-8a2247b3b38aff43ffe076acbb0674abbee2489b.tar.gz
netsurf-8a2247b3b38aff43ffe076acbb0674abbee2489b.tar.bz2
Squash some warnings, don't attempt to free data we don't own
svn path=/trunk/netsurf/; revision=11154
Diffstat (limited to 'amiga/misc.c')
-rwxr-xr-xamiga/misc.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/amiga/misc.c b/amiga/misc.c
index 96d41d19d..e2f566f94 100755
--- a/amiga/misc.c
+++ b/amiga/misc.c
@@ -17,14 +17,19 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+
#include <sys/types.h>
-#include "desktop/cookies.h"
+
#include <proto/dos.h>
+
+#include "amiga/utf8.h"
+#include "desktop/cookies.h"
+#include "utils/log.h"
#include "utils/messages.h"
-#include <stdlib.h>
-#include "utils/utils.h"
#include "utils/url.h"
+#include "utils/utils.h"
void warn_user(const char *warning, const char *detail)
{
@@ -32,14 +37,12 @@ void warn_user(const char *warning, const char *detail)
LOG(("%s %s", warning, detail));
- if(!utf8warning) utf8warning = warning;
-
TimedDosRequesterTags(TDR_ImageType,TDRIMAGE_WARNING,
TDR_TitleString,messages_get("NetSurf"),
TDR_GadgetString,messages_get("OK"),
// TDR_CharSet,106,
TDR_FormatString,"%s\n%s",
- TDR_Arg1,utf8warning,
+ TDR_Arg1,utf8warning != NULL ? utf8warning : warning,
TDR_Arg2,detail,
TAG_DONE);