summaryrefslogtreecommitdiff
path: root/desktop/browser.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2005-06-07 21:29:26 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2005-06-07 21:29:26 +0000
commit0bcfdbeb50b2435b848ea1fd50ccc79ba64fd129 (patch)
treeb24749b82e3e4f840f7ecfd7f2fcdfc5bd26a291 /desktop/browser.c
parentbe6a75509d4abdd1ddc9742780e1a80e33f53917 (diff)
downloadnetsurf-0bcfdbeb50b2435b848ea1fd50ccc79ba64fd129.tar.gz
netsurf-0bcfdbeb50b2435b848ea1fd50ccc79ba64fd129.tar.bz2
[project @ 2005-06-07 21:29:26 by jmb]
Lose cnv_str_local_enc and friends. UTF-8 conversion functions now return an enumerated type allowing for fallbacks, if appropriate. svn path=/import/netsurf/; revision=1744
Diffstat (limited to 'desktop/browser.c')
-rw-r--r--desktop/browser.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 49d81dadd..13ca3cab9 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -41,6 +41,7 @@
#include "netsurf/utils/talloc.h"
#include "netsurf/utils/url.h"
#include "netsurf/utils/utils.h"
+#include "netsurf/utils/utf8.h"
/** browser window which is being redrawn. Valid only during redraw. */
@@ -480,12 +481,16 @@ void browser_window_update(struct browser_window *bw,
char *title_local_enc;
struct box *pos;
int x, y;
+ utf8_convert_ret err;
if (!bw->current_content)
return;
- if (bw->current_content->title != NULL
- && (title_local_enc = cnv_str_local_enc(bw->current_content->title)) != NULL) {
+ if (bw->current_content->title != NULL) {
+ err = utf8_to_enc(bw->current_content->title,
+ local_encoding_name(), 0, &title_local_enc);
+ /* this should never fail */
+ assert(err == UTF8_CONVERT_OK);
gui_window_set_title(bw->window, title_local_enc);
free(title_local_enc);
} else