mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-01 00:34:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2006-03-25 22:48:32 by jmb]

Browse Source 
Assert that template names are <=11 chars long.
Rename con_language to con_lang

svn path=/import/netsurf/; revision=2165
This commit is contained in:
John Mark Bell 2006-03-25 22:48:32 +00:00
parent 5a72700817
commit c098703201
11 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
!NetSurf/Resources/Sprites,ff9
View File

Binary file not shown.

2
!NetSurf/Resources/de/Messages
View File

@ -701,7 +701,7 @@ con_theme:Themes
con_cache:Cache
con_home:Home page
con_inter:Interface
con_language:Language
con_lang:Language
con_security:Security

BIN
!NetSurf/Resources/de/Templates,fec
View File

Binary file not shown.

2
!NetSurf/Resources/en/Messages
View File

@ -700,7 +700,7 @@ con_theme:Themes
con_cache:Cache
con_home:Home page
con_inter:Interface
con_language:Language
con_lang:Language
con_security:Security

BIN
!NetSurf/Resources/en/Templates,fec
View File

Binary file not shown.

2
!NetSurf/Resources/fr/Messages
View File

@ -701,7 +701,7 @@ con_theme:Themes
con_cache:Cache
con_home:Home page
con_inter:Interface
con_language:Language
con_lang:Language
con_security:Security

BIN
!NetSurf/Resources/fr/Templates,fec
View File

Binary file not shown.

2
!NetSurf/Resources/nl/Messages
View File

@ -703,7 +703,7 @@ con_theme:Themes
con_cache:Cache
con_home:Home page
con_inter:Interface
con_language:Language
con_lang:Language
con_security:Security

BIN
!NetSurf/Resources/nl/Templates,fec
View File

Binary file not shown.

2
riscos/configure.c
View File

@ -80,7 +80,7 @@ void ro_gui_configure_initialise(void) {
ro_gui_configure_register("con_home",
ro_gui_options_home_initialise,
ro_gui_wimp_event_finalise);
ro_gui_configure_register("con_language",
ro_gui_configure_register("con_lang",
ro_gui_options_language_initialise,
ro_gui_wimp_event_finalise);
ro_gui_configure_register("con_inter",

17
riscos/dialog.c
View File

@ -249,17 +249,12 @@ wimp_window * ro_gui_dialog_load_template(const char *template_name)
wimp_window *window;
os_error *error;
/* Template names must be <= 11 chars long */
assert(strlen(template_name) <= 11);
/* wimp_load_template won't accept a const char * */
strncpy(name, template_name, sizeof name);
/* there is an OS bug such that wimp_load_template with a 12 character
* name will sometimes fail. to work around it we truncate such names to a
* 10 character wildcarded name, eg 'con_language' -> 'con_langua*' */
if (strlen(template_name) > 11) {
name[10] = '*';
name[11] = '\0';
}
/* find required buffer sizes */
error = xwimp_load_template(wimp_GET_SIZE, 0, 0, wimp_NO_FONTS,
name, 0, &window_size, &data_size, &context);
@ -283,12 +278,6 @@ wimp_window * ro_gui_dialog_load_template(const char *template_name)
die("NoMemory");
}
/* the OS has updated our name, so we reset it back if required*/
if (strlen(template_name) > 11) {
name[10] = '*';
name[11] = '\0';
}
/* load template */
error = xwimp_load_template(window, data, data + data_size,
wimp_NO_FONTS, name, 0, 0, 0, 0);