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

Fix some types

Browse Source 
If "easy" charset conversion fails, return a copy of the original string.

svn path=/trunk/netsurf/; revision=10580
This commit is contained in:
Chris Young 2010-06-26 16:26:05 +00:00
parent cd8e367ce4
commit d36758ad97
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
amiga/gui.c
View File

@ -2950,26 +2950,29 @@ void gui_window_set_title(struct gui_window *g, const char *title)
{
node = g->tab_node;
SetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],
g->shared->win, NULL,
CLICKTAB_Labels, ~0,
TAG_DONE);
SetClickTabNodeAttrs(node, TNA_Text, utf8title,
TNA_HintInfo, utf8title,
TAG_DONE);
RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],
if((g->tabtitle == NULL) || (strcmp(utf8title, g->tabtitle)))
{
SetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],
g->shared->win, NULL,
CLICKTAB_Labels, &g->shared->tab_list,
CLICKTAB_Labels, ~0,
TAG_DONE);
if(g->tabtitle) ami_utf8_free(g->tabtitle);
g->tabtitle = utf8title;
SetClickTabNodeAttrs(node, TNA_Text, utf8title,
TNA_HintInfo, utf8title,
TAG_DONE);
if(ClickTabBase->lib_Version < 53)
RethinkLayout((struct Gadget *)g->shared->objects[GID_TABLAYOUT],
g->shared->win, NULL, TRUE);
RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],
g->shared->win, NULL,
CLICKTAB_Labels, &g->shared->tab_list,
TAG_DONE);
if(g->tabtitle) ami_utf8_free(g->tabtitle);
g->tabtitle = utf8title;
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);

2
amiga/stringview/urlhistory.c
View File

@ -29,7 +29,7 @@
#include "content/urldb.h"
#include "desktop/options.h"
struct List PageList;
static struct List PageList;
void URLHistory_Init( void )
{

10
amiga/utf8.c
View File

@ -25,12 +25,12 @@
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);
encname = ObtainCharsetInfo(DFCS_NUMBER, charset, DFCS_MIMENAME);
return utf8_to_enc(string,encname,len,result);
}
@ -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);