diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-03 11:55:28 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-03 11:55:28 +0000 |
| commit | 49810d8191e9a806ceb8a92c68369d8dac261f0d (patch) | |
| tree | d57d82c882eb92f0d0bcf409b43a54beadc91e04 /render | |
| parent | 6835a312b7df68c23fec9930b8e0aec94b537e5f (diff) | |
| download | netsurf-49810d8191e9a806ceb8a92c68369d8dac261f0d.tar.gz netsurf-49810d8191e9a806ceb8a92c68369d8dac261f0d.tar.bz2 | |
Use mutator to modify content's title field.
svn path=/trunk/netsurf/; revision=10231
Diffstat (limited to 'render')
| -rw-r--r-- | render/html.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/render/html.c b/render/html.c index 3b3abb782..b74c24225 100644 --- a/render/html.c +++ b/render/html.c @@ -510,14 +510,12 @@ bool html_head(struct content *c, xmlNode *head) xmlNode *node; xmlChar *s; - c->title = 0; - for (node = head->children; node != 0; node = node->next) { if (node->type != XML_ELEMENT_NODE) continue; LOG(("Node: %s", node->name)); - if (!c->title && strcmp((const char *) node->name, + if (c->title == NULL && strcmp((const char *) node->name, "title") == 0) { xmlChar *title = xmlNodeGetContent(node); char *title2; @@ -527,10 +525,12 @@ bool html_head(struct content *c, xmlNode *head) xmlFree(title); if (!title2) return false; - c->title = talloc_strdup(c, title2); - free(title2); - if (!c->title) + if (content__set_title(c, title2) == false) { + free(title2); return false; + } + + free(title2); } else if (strcmp((const char *) node->name, "base") == 0) { char *href = (char *) xmlGetProp(node, @@ -1747,8 +1747,8 @@ void html_destroy(struct content *c) imagemap_destroy(c); if (c->bitmap) { - bitmap_destroy(c->bitmap); - c->bitmap = NULL; + bitmap_destroy(c->bitmap); + c->bitmap = NULL; } if (c->data.html.parser_binding) |