mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-12-22 20:16:54 +03:00
Fix some types
If "easy" charset conversion fails, return a copy of the original string. svn path=/trunk/netsurf/; revision=10580
This commit is contained in:
parent
cd8e367ce4
commit
d36758ad97
@ -2950,6 +2950,8 @@ void gui_window_set_title(struct gui_window *g, const char *title)
|
||||
{
|
||||
node = g->tab_node;
|
||||
|
||||
if((g->tabtitle == NULL) || (strcmp(utf8title, g->tabtitle)))
|
||||
{
|
||||
SetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],
|
||||
g->shared->win, NULL,
|
||||
CLICKTAB_Labels, ~0,
|
||||
@ -2970,6 +2972,7 @@ void gui_window_set_title(struct gui_window *g, const char *title)
|
||||
if(ClickTabBase->lib_Version < 53)
|
||||
RethinkLayout((struct Gadget *)g->shared->objects[GID_TABLAYOUT],
|
||||
g->shared->win, NULL, TRUE);
|
||||
}
|
||||
|
||||
GetAttr(CLICKTAB_Current, g->shared->objects[GID_TABS],
|
||||
(ULONG *)&cur_tab);
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include "content/urldb.h"
|
||||
#include "desktop/options.h"
|
||||
|
||||
struct List PageList;
|
||||
static struct List PageList;
|
||||
|
||||
void URLHistory_Init( void )
|
||||
{
|
||||
|
@ -25,7 +25,7 @@
|
||||
utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len,
|
||||
char **result)
|
||||
{
|
||||
ULONG *charset;
|
||||
LONG charset;
|
||||
char *encname;
|
||||
|
||||
charset = GetDiskFontCtrl(DFCTRL_CHARSET);
|
||||
@ -49,7 +49,7 @@ char *ami_utf8_easy(char *string)
|
||||
}
|
||||
else
|
||||
{
|
||||
return NULL;
|
||||
return strdup(string);
|
||||
}
|
||||
}
|
||||
|
||||
@ -63,14 +63,14 @@ char *ami_to_utf8_easy(char *string)
|
||||
}
|
||||
else
|
||||
{
|
||||
return NULL;
|
||||
return strdup(string);
|
||||
}
|
||||
}
|
||||
|
||||
utf8_convert_ret utf8_from_local_encoding(const char *string, size_t len,
|
||||
char **result)
|
||||
{
|
||||
ULONG *charset;
|
||||
LONG charset;
|
||||
char *encname;
|
||||
|
||||
charset = GetDiskFontCtrl(DFCTRL_CHARSET);
|
||||
|
Loading…
Reference in New Issue
Block a user