Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/71afaacc80c6d94e1406249c61c338a4131d24a7
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/71afaacc80c6d94e1406249c61c338a4131d24a7
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/71afaacc80c6d94e1406249c61c338a4131d24a7

The branch, master has been updated
       via  71afaacc80c6d94e1406249c61c338a4131d24a7 (commit)
      from  2a9e89de751b6a6600feee2bc3960affb73c6988 (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=71afaacc80c6d94e1406249c61c338a4131d24a7
commit 71afaacc80c6d94e1406249c61c338a4131d24a7
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    Fix last tab title not being freed

diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 7678505..3e68c90 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -4497,7 +4497,7 @@ static void gui_window_destroy(struct gui_window *g)
 
        cur_gw = NULL;
 
-       if(g->shared->tabs > 1) {
+       if(g->tab_node) {
                SetGadgetAttrs((struct Gadget 
*)g->shared->objects[GID_TABS],g->shared->win,NULL,
                                                CLICKTAB_Labels,~0,
                                                TAG_DONE);
@@ -4527,8 +4527,7 @@ static void gui_window_destroy(struct gui_window *g)
                if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show) == 
false))
                        ami_toggletabbar(g->shared, false);
 
-               ami_utf8_free(g->tabtitle);
-
+               free(g->tabtitle);
                free(g);
                return;
        }
@@ -4595,8 +4594,7 @@ static void gui_window_set_title(struct gui_window *g, 
const char *restrict titl
 
        utf8title = ami_utf8_easy((char *)title);
 
-       if(g->tab_node) // && (g->shared->tabs > 1))
-       {
+       if(g->tab_node) {
                node = g->tab_node;
 
                if((g->tabtitle == NULL) || (strcmp(utf8title, g->tabtitle)))
@@ -4606,7 +4604,7 @@ static void gui_window_set_title(struct gui_window *g, 
const char *restrict titl
                                                        CLICKTAB_Labels, ~0,
                                                        TAG_DONE);
 
-                       if(g->tabtitle) ami_utf8_free(g->tabtitle);
+                       if(g->tabtitle) free(g->tabtitle);
                        g->tabtitle = strdup(utf8title);
 
                        SetClickTabNodeAttrs(node, TNA_Text, g->tabtitle,


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

Summary of changes:
 frontends/amiga/gui.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 7678505..3e68c90 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -4497,7 +4497,7 @@ static void gui_window_destroy(struct gui_window *g)
 
        cur_gw = NULL;
 
-       if(g->shared->tabs > 1) {
+       if(g->tab_node) {
                SetGadgetAttrs((struct Gadget 
*)g->shared->objects[GID_TABS],g->shared->win,NULL,
                                                CLICKTAB_Labels,~0,
                                                TAG_DONE);
@@ -4527,8 +4527,7 @@ static void gui_window_destroy(struct gui_window *g)
                if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show) == 
false))
                        ami_toggletabbar(g->shared, false);
 
-               ami_utf8_free(g->tabtitle);
-
+               free(g->tabtitle);
                free(g);
                return;
        }
@@ -4595,8 +4594,7 @@ static void gui_window_set_title(struct gui_window *g, 
const char *restrict titl
 
        utf8title = ami_utf8_easy((char *)title);
 
-       if(g->tab_node) // && (g->shared->tabs > 1))
-       {
+       if(g->tab_node) {
                node = g->tab_node;
 
                if((g->tabtitle == NULL) || (strcmp(utf8title, g->tabtitle)))
@@ -4606,7 +4604,7 @@ static void gui_window_set_title(struct gui_window *g, 
const char *restrict titl
                                                        CLICKTAB_Labels, ~0,
                                                        TAG_DONE);
 
-                       if(g->tabtitle) ami_utf8_free(g->tabtitle);
+                       if(g->tabtitle) free(g->tabtitle);
                        g->tabtitle = strdup(utf8title);
 
                        SetClickTabNodeAttrs(node, TNA_Text, g->tabtitle,


-- 
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