tMaking the empty title possible. - 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 361da0b3c4bc9f86d4653b026ad16ec4ed5c02c2
 (DIR) parent b7435badc2558dfd9b177005a0884b9bbc12fa1e
 (HTM) Author: Christoph Lohmann <20h@r-36.net>
       Date:   Wed,  5 Feb 2014 21:14:16 +0100
       
       Making the empty title possible.
       
       Diffstat:
         M surf.c                              |      24 +++++++++++++++---------
       
       1 file changed, 15 insertions(+), 9 deletions(-)
       ---
 (DIR) diff --git a/surf.c b/surf.c
       t@@ -707,6 +707,9 @@ newclient(void) {
                if(!(c = calloc(1, sizeof(Client))))
                        die("Cannot malloc!\n");
        
       +        c->title = NULL;
       +        c->progress = 100;
       +
                /* Window */
                if(embed) {
                        c->win = gtk_plug_new(embed);
       t@@ -890,9 +893,6 @@ newclient(void) {
                if(hidebackground)
                        webkit_web_view_set_transparent(c->view, TRUE);
        
       -        c->title = "";
       -        c->progress = 100;
       -        updatetitle(c);
                c->next = clients;
                clients = c;
        
       t@@ -1337,16 +1337,18 @@ updatetitle(Client *c) {
                                                pagestat, c->linkhover);
                        } else if(c->progress != 100) {
                                t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress,
       -                                        togglestat, pagestat, c->title);
       +                                        togglestat, pagestat,
       +                                        (c->title == NULL)? "" : c->title);
                        } else {
                                t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
       -                                        c->title);
       +                                        (c->title == NULL)? "" : c->title);
                        }
        
                        gtk_window_set_title(GTK_WINDOW(c->win), t);
                        g_free(t);
                } else {
       -                gtk_window_set_title(GTK_WINDOW(c->win), c->title);
       +                gtk_window_set_title(GTK_WINDOW(c->win),
       +                                (c->title == NULL)? "" : c->title);
                }
        }
        
       t@@ -1390,6 +1392,7 @@ zoom(Client *c, const Arg *arg) {
        int
        main(int argc, char *argv[]) {
                Arg arg;
       +        Client *c;
        
                memset(&arg, 0, sizeof(arg));
        
       t@@ -1462,7 +1465,7 @@ main(int argc, char *argv[]) {
                        useragent = EARGF(usage());
                        break;
                case 'v':
       -                die("surf-"VERSION", ©2009-2012 surf engineers, "
       +                die("surf-"VERSION", ©2009-2014 surf engineers, "
                                        "see LICENSE for details\n");
                case 'x':
                        showxid = TRUE;
       t@@ -1477,9 +1480,12 @@ main(int argc, char *argv[]) {
                        arg.v = argv[0];
        
                setup();
       -        newclient();
       -        if(arg.v)
       +        c = newclient();
       +        if(arg.v) {
                        loaduri(clients, &arg);
       +        } else {
       +                updatetitle(c);
       +        }
        
                gtk_main();
                cleanup();