[project @ 2003-07-17 23:01:02 by bursa]

Fix 670947, tidy gui code, move some headers.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/render/box.c b/render/box.c
index aee750bc1..27b4fceae 100644
--- a/render/box.c
+++ b/render/box.c
@@ -17,10 +17,10 @@
 #include "netsurf/content/fetchcache.h"
 #include "netsurf/css/css.h"
 #include "netsurf/render/box.h"
+#include "netsurf/render/font.h"
 #include "netsurf/render/html.h"
 #ifdef riscos
 #include "netsurf/desktop/gui.h"
-#include "netsurf/riscos/font.h"
 #include "netsurf/riscos/plugin.h"
 #endif
 #define NDEBUG
@@ -1691,12 +1691,12 @@ bool plugin_decode(struct content* content, char* url, struct box* box,
    * we can't handle this object.
    */
    if(po->data == 0 && po->classid == 0) {
-           return FALSE;
+           return false;
    }
    if(po->data == 0 && po->classid != 0) {
            if(strncasecmp(po->classid, "clsid:", 6) == 0) {
                    LOG(("ActiveX object - n0"));
-                   return FALSE;
+                   return false;
            }
            else {
                    url = url_join(po->classid, po->codebase);
@@ -1718,11 +1718,11 @@ bool plugin_decode(struct content* content, char* url, struct box* box,
     */
     if(po->type != 0) {
            if (content_lookup(po->type) == CONTENT_OTHER)
-                  return FALSE;
+                  return false;
     }
     if(po->codetype != 0) {
            if (content_lookup(po->codetype) == CONTENT_OTHER)
-                  return FALSE;
+                  return false;
     }
 
   /* If we've got to here, the object declaration has provided us with
@@ -1734,6 +1734,6 @@ bool plugin_decode(struct content* content, char* url, struct box* box,
    */
    html_fetch_object(content, url, box);
 
-   return TRUE;
+   return true;
 }