From 3f21e7a40e4e5fc310e28557ef6e1133586aab99 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Fri, 6 Jun 2003 03:12:28 +0000
Subject: [project @ 2003-06-06 03:12:28 by jmb] Begin to munge <embed>s into
 <object>s

svn path=/import/netsurf/; revision=171
---
 render/box.c    | 4 ++--
 riscos/plugin.c | 6 +++---
 riscos/plugin.h | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/render/box.c b/render/box.c
index 03282ea8e..b9d566c2b 100644
--- a/render/box.c
+++ b/render/box.c
@@ -1,5 +1,5 @@
 /**
- * $Id: box.c,v 1.48 2003/06/06 02:08:56 jmb Exp $
+ * $Id: box.c,v 1.49 2003/06/06 03:12:28 jmb Exp $
  */
 
 #include <assert.h>
@@ -1505,7 +1505,7 @@ struct box* box_embed(xmlNode *n, struct content *content,
 	/* embed src */
 	if ((s = (char *) xmlGetProp(n, (const xmlChar *) "src"))) {
 
-                po->src = strdup(s);
+                po->data = strdup(s);
 	        url = url_join(strdup(s), content->url);
 	        LOG(("embed '%s'", url));
 	        xmlFree(s);
diff --git a/riscos/plugin.c b/riscos/plugin.c
index de4b5921a..28d3fc9dd 100644
--- a/riscos/plugin.c
+++ b/riscos/plugin.c
@@ -1,5 +1,5 @@
 /**
- * $Id: plugin.c,v 1.5 2003/06/06 02:30:00 jmb Exp $
+ * $Id: plugin.c,v 1.6 2003/06/06 03:12:28 jmb Exp $
  */
 
 #include <assert.h>
@@ -69,9 +69,9 @@ void plugin_decode(struct content* content, char* url, struct box* box,
 
                 /* no data so try using classid instead */
 
-                po->data = strdup(po->classid);
+                if (po->classid != NULL) {
 
-                if (po->data != NULL) {
+                        po->data = strdup(po->classid);
 
                         if (strnicmp(po->data,"clsid:",6) == 0) {
 
diff --git a/riscos/plugin.h b/riscos/plugin.h
index 9f054100a..824141337 100644
--- a/riscos/plugin.h
+++ b/riscos/plugin.h
@@ -1,5 +1,5 @@
 /**
- * $Id: plugin.h,v 1.2 2003/06/06 02:08:56 jmb Exp $
+ * $Id: plugin.h,v 1.3 2003/06/06 03:12:28 jmb Exp $
  */
 
 #ifndef _NETSURF_RISCOS_PLUGIN_H_
@@ -8,7 +8,6 @@
 struct plugin_object {
 
         char* data;
-        char* src;
         char* type;
         char* codetype;
         char* codebase;
-- 
cgit v1.2.3