[project @ 2003-11-08 21:47:10 by jmb]

Sync Info box and About Page version numbers.
If no version is specified in the Messages file, it defaults to "CVS
Test Build"
Remove unnecessary TODOs in plugin.c

svn path=/import/netsurf/; revision=415

3 files changed, 14 insertions, 23 deletions

diff --git a/riscos/about.c b/riscos/about.c
index d9b59df8d..984733a2d 100644
--- a/riscos/about.c
+++ b/riscos/about.c
@@ -68,18 +68,21 @@ char *populate_version(void) {
   char *mon;
   char *year;
   char *temp = xcalloc(12, sizeof(char));
-  char *ret = xcalloc(20, sizeof(char));
+  char *ret = xcalloc(30, sizeof(char));
 
   sprintf(temp, "%s", __DATE__);
   p = strchr(temp, ' ');
   *p = 0;
   mon = strdup(temp);
-  day = p+1;
+  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"), day, mon, year);
+  sprintf(ret, version, messages_get("Version:CVS Test Build"), day, mon, year);
 
   xfree(temp);
 
diff --git a/riscos/dialog.c b/riscos/dialog.c
index 06c6b705e..ac0474a88 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -17,6 +17,7 @@
 #include "netsurf/riscos/gui.h"
 #include "netsurf/riscos/options.h"
 #include "netsurf/utils/log.h"
+#include "netsurf/utils/messages.h"
 #include "netsurf/utils/utils.h"
 
 
@@ -64,6 +65,8 @@ static void set_icon_string_i(wimp_w w, wimp_i i, int num);
 void ro_gui_dialog_init(void)
 {
 	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"));
 	dialog_saveas = ro_gui_dialog_create("saveas");
 	dialog_config = ro_gui_dialog_create("config");
 	dialog_config_br = ro_gui_dialog_create("config_br");
diff --git a/riscos/plugin.c b/riscos/plugin.c
index a91bd1b37..0d8aac1c1 100644
--- a/riscos/plugin.c
+++ b/riscos/plugin.c
@@ -206,10 +206,7 @@ void plugin_add_instance(struct content *c, struct browser_window *bw,
           return;
         }
 
-        /* wait for wimp poll
-           TODO - we should probably give up after a short time
-                  otherwise we'll be stuck in this loop forever
-         */
+        /* wait for wimp poll */
         while(temp->poll == 0)
                 gui_poll(true);
 
@@ -251,10 +248,7 @@ void plugin_add_instance(struct content *c, struct browser_window *bw,
                  return;
                }
 
-               /* wait for wimp poll
-                  TODO - we should probably give up after a short time
-                         otherwise we'll be stuck in this loop forever
-                */
+               /* wait for wimp poll */
                while(temp->poll == 0)
                        gui_poll(true);
 
@@ -365,10 +359,7 @@ void plugin_remove_instance(struct content *c, struct browser_window *bw,
 	xwimp_send_message(wimp_USER_MESSAGE_RECORDED, &m,
 	                   (wimp_t)params->plugin_task);
 
-        /* wait for wimp poll
-           TODO - we should probably give up after a short time
-                  otherwise we'll be stuck in this loop forever
-         */
+        /* wait for wimp poll */
 	while (temp == 0)
 	        gui_poll(true);
 
@@ -784,10 +775,7 @@ void plugin_create_stream(struct browser_window *bw, struct object_params *param
         LOG(("Sending message &4D548"));
         xwimp_send_message(wimp_USER_MESSAGE_RECORDED, &m, (wimp_t)params->plugin_task);
 
-        /* wait for wimp poll
-           TODO - we should probably give up after a short time
-                  otherwise we'll be stuck in this loop forever
-         */
+        /* wait for wimp poll */
         while(temp->poll == 0)
                 gui_poll(true);
 
@@ -846,10 +834,7 @@ void plugin_write_stream(struct browser_window *bw, struct object_params *params
                 LOG(("Sending message &4D54A"));
                 xwimp_send_message(wimp_USER_MESSAGE_RECORDED, &m, (wimp_t)params->plugin_task);
 
-                /* wait for wimp poll
-                   TODO - we should probably give up after a short time
-                          otherwise we'll be stuck in this loop forever
-                 */
+                /* wait for wimp poll */
                 while(temp->poll == 0)
                         gui_poll(true);