diff --git a/riscos/about.c b/riscos/about.c index 984733a2d..c5c15b870 100644 --- a/riscos/about.c +++ b/riscos/about.c @@ -27,7 +27,6 @@ #include "oslib/osfind.h" #include "oslib/osfscontrol.h" -static const char *version = "%s (%s %s %s)"; /**< version string prototype */ static const char *pabouthdr = "About NetSurf
\"Netsurf
 

NetSurf %s

Copyright © 2002, 2003 NetSurf Developers.
 
"; /**< About page header */ static const char *pabtplghd = "The following plugins are installed on your system:
 
"; /**< Plugin table header */ static const char *paboutpl1 = ""; /**< Plugin entry without image */ @@ -55,39 +54,6 @@ struct plugd { }; struct plugd *new_plugin(struct plugd *pd, char* details); -char* populate_version(void); - -/** - * Fills in the version string. - * The release version is defined in the Messages file. - */ -char *populate_version(void) { - - char *p; - char *day; - char *mon; - char *year; - char *temp = xcalloc(12, sizeof(char)); - char *ret = xcalloc(30, sizeof(char)); - - sprintf(temp, "%s", __DATE__); - p = strchr(temp, ' '); - *p = 0; - mon = strdup(temp); - if (strchr(p+1, ' ') == p+1) - day = p+2; - else - day = p+1; - p = strchr(day, ' '); - *p = 0; - year = p+1; - - sprintf(ret, version, messages_get("Version:CVS Test Build"), day, mon, year); - - xfree(temp); - - return ret; -} /** * Adds a plugin's details to the head of the linked list of plugin details diff --git a/riscos/dialog.c b/riscos/dialog.c index 22f01225c..39e6e0572 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -64,9 +64,14 @@ static void set_icon_string_i(wimp_w w, wimp_i i, int num); void ro_gui_dialog_init(void) { + char *ver; + dialog_info = ro_gui_dialog_create("info"); /* fill in about box version info */ - set_icon_string(dialog_info, 4, messages_get("Version:CVS Test Build")); + ver = populate_version(); + set_icon_string(dialog_info, 4, ver); + xfree(ver); + dialog_saveas = ro_gui_dialog_create("saveas"); dialog_config = ro_gui_dialog_create("config"); dialog_config_br = ro_gui_dialog_create("config_br"); @@ -228,7 +233,7 @@ void ro_gui_dialog_click_config_br(wimp_pointer *pointer) break; case ICON_CONFIG_BR_EXPLAIN: bw = create_browser_window(browser_TITLE | browser_TOOLBAR | - browser_SCROLL_X_ALWAYS | browser_SCROLL_Y_ALWAYS, 320, 256); + browser_SCROLL_X_ALWAYS | browser_SCROLL_Y_ALWAYS, 320, 256, NULL); gui_window_show(bw->window); browser_window_open_location(bw, GESTURES_URL); break; @@ -291,7 +296,7 @@ void ro_gui_dialog_click_config_th(wimp_pointer *pointer) break; case ICON_CONFIG_TH_GET: bw = create_browser_window(browser_TITLE | browser_TOOLBAR | - browser_SCROLL_X_ALWAYS | browser_SCROLL_Y_ALWAYS, 480, 320); + browser_SCROLL_X_ALWAYS | browser_SCROLL_Y_ALWAYS, 480, 320, NULL); gui_window_show(bw->window); browser_window_open_location(bw, THEMES_URL); break;
%s%s