tSimplify handling of c->title - surf - customized build of surf, the suckless webkit browser
 (HTM) git clone git://src.adamsgaard.dk/surf
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit d4ac9fb6f4b719607fa7ff13a44a78d057d27be5
 (DIR) parent 10105c8b87a1e3e4c5b98100a6947f1c350561da
 (HTM) Author: Quentin Rameau <quinq@fifth.space>
       Date:   Sun, 22 Nov 2015 13:24:24 +0100
       
       Simplify handling of c->title
       
       Diffstat:
         M surf.c                              |      30 +++++++++++++-----------------
       
       1 file changed, 13 insertions(+), 17 deletions(-)
       ---
 (DIR) diff --git a/surf.c b/surf.c
       t@@ -333,14 +333,12 @@ newclient(Client *rc)
                if (!(c = calloc(1, sizeof(Client))))
                        die("Cannot malloc!\n");
        
       -        c->title = NULL;
       -        c->progress = 100;
       -
                c->next = clients;
                clients = c;
        
       -        c->view = newview(c, rc ? rc->view : NULL);
       +        c->progress = 100;
                c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
       +        c->view = newview(c, rc ? rc->view : NULL);
        
                return c;
        }
       t@@ -435,26 +433,24 @@ void
        updatetitle(Client *c)
        {
                char *title;
       +        const char *name = c->targeturi ? c->targeturi :
       +                           c->title ? c->title : "";
        
                if (showindicators) {
                        gettogglestats(c);
                        getpagestats(c);
        
       -                if (c->progress != 100) {
       +                if (c->progress != 100)
                                title = g_strdup_printf("[%i%%] %s:%s | %s",
       -                                c->progress, togglestats, pagestats,
       -                                c->targeturi ? c->targeturi : c->title);
       -                } else {
       +                                c->progress, togglestats, pagestats, name);
       +                else
                                title = g_strdup_printf("%s:%s | %s",
       -                                togglestats, pagestats,
       -                                c->targeturi ? c->targeturi : c->title);
       -                }
       +                                togglestats, pagestats, name);
        
                        gtk_window_set_title(GTK_WINDOW(c->win), title);
                        g_free(title);
                } else {
       -                gtk_window_set_title(GTK_WINDOW(c->win), c->title ?
       -                                     c->title : "");
       +                gtk_window_set_title(GTK_WINDOW(c->win), name);
                }
        }
        
       t@@ -1543,15 +1539,15 @@ main(int argc, char *argv[])
                } ARGEND;
                if (argc > 0)
                        arg.v = argv[0];
       +        else
       +                arg.v = "about:blank";
        
                setup();
                c = newclient(NULL);
                showview(NULL, c);
        
       -        if (arg.v)
       -                loaduri(clients, &arg);
       -        else
       -                updatetitle(c);
       +        loaduri(c, &arg);
       +        updatetitle(c);
        
                gtk_main();
                cleanup();