Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/5775e3941169952517eab741bb6e2262b48f6584
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/5775e3941169952517eab741bb6e2262b48f6584
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/5775e3941169952517eab741bb6e2262b48f6584

The branch, master has been updated
       via  5775e3941169952517eab741bb6e2262b48f6584 (commit)
      from  49a82109ce2f4d44e92dfbbb4ad59311f54bad03 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=5775e3941169952517eab741bb6e2262b48f6584
commit 5775e3941169952517eab741bb6e2262b48f6584
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>

    amiga: Fix more content error snafus.
    
    Signed-off-by: Daniel Silverstone <[email protected]>

diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index e526561..3b2b942 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -187,7 +187,7 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct 
content *c)
                bitmap = amiga_bitmap_create(c->width, c->height, BITMAP_NEW);
                if (!bitmap) {
                        msg_data.errordata.errorcode = NSERROR_NOMEM;
-                       msg_data.errordata.errorcode = messages_get("NoMemory");
+                       msg_data.errordata.errormsg = messages_get("NoMemory");
                        content_broadcast(c, CONTENT_MSG_ERROR, &msg_data);
                        return NULL;
                }
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 6e82579..914ab65 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -154,7 +154,8 @@ bool amiga_icon_convert(struct content *c)
        /* This loader will only work on local files, so fail if not a local 
path */
        if(filename == NULL)
        {
-               msg_data.error = messages_get("NoMemory");
+               msg_data.errordata.errorcode = NSERROR_NOMEM;
+               msg_data.errordata.errormsg = messages_get("NoMemory");
                content_broadcast(c, CONTENT_MSG_ERROR, &msg_data);
                return false;
        }


-----------------------------------------------------------------------

Summary of changes:
 frontends/amiga/dt_picture.c |    2 +-
 frontends/amiga/icon.c       |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c
index e526561..3b2b942 100644
--- a/frontends/amiga/dt_picture.c
+++ b/frontends/amiga/dt_picture.c
@@ -187,7 +187,7 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct 
content *c)
                bitmap = amiga_bitmap_create(c->width, c->height, BITMAP_NEW);
                if (!bitmap) {
                        msg_data.errordata.errorcode = NSERROR_NOMEM;
-                       msg_data.errordata.errorcode = messages_get("NoMemory");
+                       msg_data.errordata.errormsg = messages_get("NoMemory");
                        content_broadcast(c, CONTENT_MSG_ERROR, &msg_data);
                        return NULL;
                }
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 6e82579..914ab65 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -154,7 +154,8 @@ bool amiga_icon_convert(struct content *c)
        /* This loader will only work on local files, so fail if not a local 
path */
        if(filename == NULL)
        {
-               msg_data.error = messages_get("NoMemory");
+               msg_data.errordata.errorcode = NSERROR_NOMEM;
+               msg_data.errordata.errormsg = messages_get("NoMemory");
                content_broadcast(c, CONTENT_MSG_ERROR, &msg_data);
                return false;
        }


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to