Adapt page statistics

Rename *pagestat to plural *pagestats, and resize array to reflect
missing proxy parameter.
This commit is contained in:
Quentin Rameau 2015-11-20 16:48:18 +01:00
parent 84611a5d29
commit 690118133d

18
surf.c
View file

@ -108,7 +108,7 @@ static Window embed = 0;
static gboolean showxid = FALSE; static gboolean showxid = FALSE;
static char winid[64]; static char winid[64];
static char togglestat[9]; static char togglestat[9];
static char pagestat[3]; static char pagestats[2];
static GTlsDatabase *tlsdb; static GTlsDatabase *tlsdb;
static int cookiepolicy; static int cookiepolicy;
static char *stylefile = NULL; static char *stylefile = NULL;
@ -143,7 +143,7 @@ static gboolean permissionrequested(WebKitWebView *v,
WebKitPermissionRequest *r, Client *c); WebKitPermissionRequest *r, Client *c);
static const char *getatom(Client *c, int a); static const char *getatom(Client *c, int a);
static void gettogglestat(Client *c); static void gettogglestat(Client *c);
static void getpagestat(Client *c); static void getpagestats(Client *c);
static char *geturi(Client *c); static char *geturi(Client *c);
static const gchar *getstyle(const char *uri); static const gchar *getstyle(const char *uri);
static void setstyle(Client *c, const char *stylefile); static void setstyle(Client *c, const char *stylefile);
@ -1420,13 +1420,11 @@ gettogglestat(Client *c)
} }
void void
getpagestat(Client *c) getpagestats(Client *c)
{ {
const char *uri = geturi(c);
pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' : pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
c->tlsflags > 0 ? 'U' : 'T'; c->tlsflags > 0 ? 'U' : 'T';
pagestat[1] = '\0'; pagestats[1] = '\0';
} }
void void
@ -1436,17 +1434,17 @@ updatetitle(Client *c)
if (showindicators) { if (showindicators) {
gettogglestat(c); gettogglestat(c);
getpagestat(c); getpagestats(c);
if (c->linkhover) { if (c->linkhover) {
t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, t = g_strdup_printf("%s:%s | %s", togglestat, pagestats,
c->linkhover); c->linkhover);
} else if (c->progress != 100) { } else if (c->progress != 100) {
t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress, t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress,
togglestat, pagestat, togglestat, pagestats,
c->title == NULL ? "" : c->title); c->title == NULL ? "" : c->title);
} else { } else {
t = g_strdup_printf("%s:%s | %s", togglestat, pagestat, t = g_strdup_printf("%s:%s | %s", togglestat, pagestats,
c->title == NULL ? "" : c->title); c->title == NULL ? "" : c->title);
} }