diff options
| author | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-28 21:40:13 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@netsurf-browser.org> | 2014-01-28 21:40:13 +0000 |
| commit | 654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc (patch) | |
| tree | efbc3d97a8650b682b7181e748698de9c555d80d /gtk/dialogs/source.c | |
| parent | 4b760c7e499e2f5cb1d06242d5f186e14e94496a (diff) | |
| download | netsurf-654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc.tar.gz netsurf-654da2ffb5abf2afe9532f1d0cb77ed88f8a97cc.tar.bz2 | |
move utf8 conversion routines to use nserror instead of their own error enum
Diffstat (limited to 'gtk/dialogs/source.c')
| -rw-r--r-- | gtk/dialogs/source.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index a7c98152e..a32bce675 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -169,16 +169,16 @@ void nsgtk_source_dialog_init(GtkWindow *parent, struct browser_window *bw) source_data = content_get_source_data(bw->current_content, &source_size); - utf8_convert_ret r = utf8_from_enc( + nserror r = utf8_from_enc( source_data, html_get_encoding(bw->current_content), source_size, &data, &data_len); - if (r == UTF8_CONVERT_NOMEM) { + if (r == NSERROR_NOMEM) { warn_user("NoMemory",0); return; - } else if (r == UTF8_CONVERT_BADENC) { + } else if (r == NSERROR_BAD_ENCODING) { warn_user("EncNotRec",0); return; } @@ -270,7 +270,7 @@ void nsgtk_source_tab_init(GtkWindow *parent, struct browser_window *bw) size_t ndata_len; nsurl *url; nserror error; - utf8_convert_ret r; + nserror r; gchar *filename; char *fileurl; gint handle; @@ -283,10 +283,10 @@ void nsgtk_source_tab_init(GtkWindow *parent, struct browser_window *bw) source_size, &ndata, &ndata_len); - if (r == UTF8_CONVERT_NOMEM) { + if (r == NSERROR_NOMEM) { warn_user("NoMemory",0); return; - } else if (r == UTF8_CONVERT_BADENC) { + } else if (r == NSERROR_BAD_ENCODING) { warn_user("EncNotRec",0); return; } |