diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-02-27 20:11:39 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-02-27 20:11:39 +0000 |
| commit | 86a2e0076d0789247a28f370d16583ee4fc87f05 (patch) | |
| tree | b3ae01afe554abbb0bc98787fef4cb0fe0be35ed /riscos | |
| parent | b79dcabd41b48111733dd49fd68ab65f1b97347b (diff) | |
| download | netsurf-86a2e0076d0789247a28f370d16583ee4fc87f05.tar.gz netsurf-86a2e0076d0789247a28f370d16583ee4fc87f05.tar.bz2 | |
Fix bug #3194007: stop emitting duplicate READY/DONE events.
* Make content handlers responsible for setting READY/DONE state & emitting events.
* Stop content_convert doing this when there is a registered convert function for the content type.
svn path=/trunk/netsurf/; revision=11850
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/artworks.c | 3 | ||||
| -rw-r--r-- | riscos/draw.c | 3 | ||||
| -rw-r--r-- | riscos/plugin.c | 4 | ||||
| -rw-r--r-- | riscos/sprite.c | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/riscos/artworks.c b/riscos/artworks.c index 318666bea..45bba1a13 100644 --- a/riscos/artworks.c +++ b/riscos/artworks.c @@ -202,7 +202,8 @@ bool artworks_convert(struct content *c) snprintf(title, sizeof(title), messages_get("ArtWorksTitle"), c->width, c->height, source_size); content__set_title(c, title); - c->status = CONTENT_STATUS_DONE; + content_set_ready(c); + content_set_done(c); /* Done: update status bar */ content_set_status(c, ""); return true; diff --git a/riscos/draw.c b/riscos/draw.c index b5c13d621..76bda452f 100644 --- a/riscos/draw.c +++ b/riscos/draw.c @@ -84,7 +84,8 @@ bool draw_convert(struct content *c) c->height, source_size); content__set_title(c, title); - c->status = CONTENT_STATUS_DONE; + content_set_ready(c); + content_set_done(c); /* Done: update status bar */ content_set_status(c, ""); return true; diff --git a/riscos/plugin.c b/riscos/plugin.c index 19fd2b806..25b2afe54 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -219,7 +219,9 @@ bool plugin_convert(struct content *c, int width, int height) c->width = width; c->height = height; - c->status = CONTENT_STATUS_DONE; + content_set_ready(c); + content_set_done(c); + return true; } diff --git a/riscos/sprite.c b/riscos/sprite.c index fbff2f885..55afa6f98 100644 --- a/riscos/sprite.c +++ b/riscos/sprite.c @@ -89,7 +89,8 @@ bool sprite_convert(struct content *c) snprintf(title, sizeof(title), messages_get("SpriteTitle"), c->width, c->height, source_size); content__set_title(c, title); - c->status = CONTENT_STATUS_DONE; + content_set_ready(c); + content_set_done(c); /* Done: update status bar */ content_set_status(c, ""); return true; |