mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-16 17:22:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pass the URL bar contents back as UTF-8.

Browse Source
This commit is contained in:
Chris Young 2015-07-18 20:12:01 +01:00
parent 3b9df4f796
commit abc7a71117
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
riscos/gui/url_bar.c
View File

@ -83,6 +83,7 @@ struct url_bar {
wimp_i text_icon; wimp_i text_icon;
char *text_buffer; char *text_buffer;
size_t text_size; size_t text_size;
char *text_buffer_utf8;
wimp_i suggest_icon; wimp_i suggest_icon;
int suggest_x, suggest_y; int suggest_x, suggest_y;
@ -508,6 +509,9 @@ void ro_gui_url_bar_destroy(struct url_bar *url_bar)
if (url_bar == NULL) if (url_bar == NULL)
return; return;
if (url_bar->text_buffer_utf8 != NULL)
free(url_bar->text_buffer_utf8);
free(url_bar); free(url_bar);
} }
@ -1073,6 +1077,15 @@ const char *ro_gui_url_bar_get_url(struct url_bar *url_bar)
if (url_bar == NULL) if (url_bar == NULL)
return NULL; return NULL;
if (url_bar->text_buffer_utf8 != NULL) {
free(url_bar->text_buffer_utf8);
url_bar->text_buffer_utf8 = NULL;
}
if (utf8_from_local_encoding(url_bar->text_buffer, 0, &url_bar->text_buffer_utf8) == NSERROR_OK) {
return (const char *) url_bar->text_buffer_utf8;
}
return (const char *) url_bar->text_buffer; return (const char *) url_bar->text_buffer;
} }