diff options
Diffstat (limited to 'riscos/content-handlers')
-rw-r--r-- | riscos/content-handlers/artworks.c | 12 | ||||
-rw-r--r-- | riscos/content-handlers/draw.c | 13 | ||||
-rw-r--r-- | riscos/content-handlers/sprite.c | 14 |
3 files changed, 27 insertions, 12 deletions
diff --git a/riscos/content-handlers/artworks.c b/riscos/content-handlers/artworks.c index 66808d42a..80733c680 100644 --- a/riscos/content-handlers/artworks.c +++ b/riscos/content-handlers/artworks.c @@ -172,7 +172,7 @@ bool artworks_convert(struct content *c) void *init_routine; os_error *error; int used = -1; /* slightly better with older OSLib versions */ - char title[100]; + char *title; /* check whether AWViewer has been seen and we can therefore locate the ArtWorks rendering modules */ @@ -263,9 +263,13 @@ bool artworks_convert(struct content *c) c->width = (aw->x1 - aw->x0) / 512; c->height = (aw->y1 - aw->y0) / 512; - snprintf(title, sizeof(title), messages_get("ArtWorksTitle"), - c->width, c->height, source_size); - content__set_title(c, title); + title = messages_get_buff("ArtWorksTitle", + nsurl_access_leaf(llcache_handle_get_url(c->llcache)), + c->width, c->height); + if (title != NULL) { + content__set_title(c, title); + free(title); + } content_set_ready(c); content_set_done(c); /* Done: update status bar */ diff --git a/riscos/content-handlers/draw.c b/riscos/content-handlers/draw.c index d18d580cd..552423980 100644 --- a/riscos/content-handlers/draw.c +++ b/riscos/content-handlers/draw.c @@ -113,7 +113,7 @@ bool draw_convert(struct content *c) const void *data; os_box bbox; os_error *error; - char title[100]; + char *title; source_data = content__get_source_data(c, &source_size); data = source_data; @@ -141,9 +141,14 @@ bool draw_convert(struct content *c) draw->x0 = bbox.x0; draw->y0 = bbox.y0; - snprintf(title, sizeof(title), messages_get("DrawTitle"), c->width, - c->height, source_size); - content__set_title(c, title); + + title = messages_get_buff("DrawTitle", + nsurl_access_leaf(llcache_handle_get_url(c->llcache)), + c->width, c->height); + if (title != NULL) { + content__set_title(c, title); + free(title); + } content_set_ready(c); content_set_done(c); diff --git a/riscos/content-handlers/sprite.c b/riscos/content-handlers/sprite.c index 9a70ebe75..3d669ad2d 100644 --- a/riscos/content-handlers/sprite.c +++ b/riscos/content-handlers/sprite.c @@ -111,7 +111,7 @@ bool sprite_convert(struct content *c) const char *source_data; unsigned long source_size; const void *sprite_data; - char title[100]; + char *title; source_data = content__get_source_data(c, &source_size); @@ -140,9 +140,15 @@ bool sprite_convert(struct content *c) c->width = w; c->height = h; - snprintf(title, sizeof(title), messages_get("SpriteTitle"), c->width, - c->height, source_size); - content__set_title(c, title); + + /* set title text */ + title = messages_get_buff("SpriteTitle", + nsurl_access_leaf(llcache_handle_get_url(c->llcache)), + c->width, c->height); + if (title != NULL) { + content__set_title(c, title); + free(title); + } content_set_ready(c); content_set_done(c); /* Done: update status bar */ |