istyle fixes: space after keywords, () with sizeof - surf - Surf web browser. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/surf//log.gph gopher.r-36.net 70 1Files /scm/surf//files.gph gopher.r-36.net 70 1Refs /scm/surf//refs.gph gopher.r-36.net 70 1README /scm/surf//file/README.gph gopher.r-36.net 70 1LICENSE /scm/surf//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit 9f5c6ff8d781f1a3a3b8fd4becd7122f3e809e1c /scm/surf//commit/9f5c6ff8d781f1a3a3b8fd4becd7122f3e809e1c.gph gopher.r-36.net 70 1parent c2bb8d0325172fc20069ccd6004b6ec1c4f5dd47 /scm/surf//commit/c2bb8d0325172fc20069ccd6004b6ec1c4f5dd47.gph gopher.r-36.net 70 hAuthor: Markus Teich URL:mailto:markus.teich@stusta.mhn.de gopher.r-36.net 70 iDate: Sun, 18 Oct 2015 22:52:16 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 istyle fixes: space after keywords, () with sizeof Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iSigned-off-by: Christoph Lohmann <20h@r-36.net> Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i surf.c | 206 ++++++++++++++++---------------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 103 insertions(+), 103 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/surf.c b/surf.c /scm/surf//file/surf.c.gph gopher.r-36.net 70 i@@ -31,7 +31,7 @@ Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i char *argv0; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i-#define LENGTH(x) (sizeof x / sizeof x[0]) Err gopher.r-36.net 70 i+#define LENGTH(x) (sizeof(x) / sizeof(x[0])) Err gopher.r-36.net 70 i #define CLEANMASK(mask) (mask & (MODKEY|GDK_SHIFT_MASK)) Err gopher.r-36.net 70 i #define COOKIEJAR_TYPE (cookiejar_get_type ()) Err gopher.r-36.net 70 i #define COOKIEJAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), COOKIEJAR_TYPE, CookieJar)) Err gopher.r-36.net 70 i@@ -222,7 +222,7 @@ addaccelgroup(Client *c) { Err gopher.r-36.net 70 i GtkAccelGroup *group = gtk_accel_group_new(); Err gopher.r-36.net 70 i GClosure *closure; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0; i < LENGTH(keys); i++) { Err gopher.r-36.net 70 i+ for (i = 0; i < LENGTH(keys); i++) { Err gopher.r-36.net 70 i closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL); Err gopher.r-36.net 70 i gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, Err gopher.r-36.net 70 i 0, closure); Err gopher.r-36.net 70 i@@ -237,10 +237,10 @@ beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r, Err gopher.r-36.net 70 i const gchar *uri = webkit_network_request_get_uri(req); Err gopher.r-36.net 70 i int i, isascii = 1; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(g_str_has_suffix(uri, "/favicon.ico")) Err gopher.r-36.net 70 i+ if (g_str_has_suffix(uri, "/favicon.ico")) Err gopher.r-36.net 70 i webkit_network_request_set_uri(req, "about:blank"); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!g_str_has_prefix(uri, "http://") \ Err gopher.r-36.net 70 i+ if (!g_str_has_prefix(uri, "http://") \ Err gopher.r-36.net 70 i && !g_str_has_prefix(uri, "https://") \ Err gopher.r-36.net 70 i && !g_str_has_prefix(uri, "about:") \ Err gopher.r-36.net 70 i && !g_str_has_prefix(uri, "file://") \ Err gopher.r-36.net 70 i@@ -248,13 +248,13 @@ beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r, Err gopher.r-36.net 70 i && !g_str_has_prefix(uri, "blob:") \ Err gopher.r-36.net 70 i && strlen(uri) > 0) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0; i < strlen(uri); i++) { Err gopher.r-36.net 70 i- if(!g_ascii_isprint(uri[i])) { Err gopher.r-36.net 70 i+ for (i = 0; i < strlen(uri); i++) { Err gopher.r-36.net 70 i+ if (!g_ascii_isprint(uri[i])) { Err gopher.r-36.net 70 i isascii = 0; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(isascii) Err gopher.r-36.net 70 i+ if (isascii) Err gopher.r-36.net 70 i handleplumb(c, w, uri); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -273,7 +273,7 @@ buildfile(const char *path) { Err gopher.r-36.net 70 i fpath = g_build_filename(bpath, bname, NULL); Err gopher.r-36.net 70 i g_free(bname); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!(f = fopen(fpath, "a"))) Err gopher.r-36.net 70 i+ if (!(f = fopen(fpath, "a"))) Err gopher.r-36.net 70 i die("Could not open file: %s\n", fpath); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i g_chmod(fpath, 0600); /* always */ Err gopher.r-36.net 70 i@@ -287,17 +287,17 @@ buildpath(const char *path) { Err gopher.r-36.net 70 i struct passwd *pw; Err gopher.r-36.net 70 i char *apath, *name, *p, *fpath; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(path[0] == '~') { Err gopher.r-36.net 70 i- if(path[1] == '/' || path[1] == '\0') { Err gopher.r-36.net 70 i+ if (path[0] == '~') { Err gopher.r-36.net 70 i+ if (path[1] == '/' || path[1] == '\0') { Err gopher.r-36.net 70 i p = (char *)&path[1]; Err gopher.r-36.net 70 i pw = getpwuid(getuid()); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i- if((p = strchr(path, '/'))) Err gopher.r-36.net 70 i+ if ((p = strchr(path, '/'))) Err gopher.r-36.net 70 i name = g_strndup(&path[1], --p - path); Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i name = g_strdup(&path[1]); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!(pw = getpwnam(name))) { Err gopher.r-36.net 70 i+ if (!(pw = getpwnam(name))) { Err gopher.r-36.net 70 i die("Can't get user %s home directory: %s.\n", Err gopher.r-36.net 70 i name, path); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -309,7 +309,7 @@ buildpath(const char *path) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* creating directory */ Err gopher.r-36.net 70 i- if(g_mkdir_with_parents(apath, 0700) < 0) Err gopher.r-36.net 70 i+ if (g_mkdir_with_parents(apath, 0700) < 0) Err gopher.r-36.net 70 i die("Could not access directory: %s\n", apath); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i fpath = realpath(apath, NULL); Err gopher.r-36.net 70 i@@ -328,8 +328,8 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i g_object_get(result, "context", &context, NULL); Err gopher.r-36.net 70 i g_object_get(result, "link-uri", &arg.v, NULL); Err gopher.r-36.net 70 i- for(i = 0; i < LENGTH(buttons); i++) { Err gopher.r-36.net 70 i- if(context & buttons[i].click && e->button == buttons[i].button && Err gopher.r-36.net 70 i+ for (i = 0; i < LENGTH(buttons); i++) { Err gopher.r-36.net 70 i+ if (context & buttons[i].click && e->button == buttons[i].button && Err gopher.r-36.net 70 i CLEANMASK(e->state) == CLEANMASK(buttons[i].mask) && buttons[i].func) { Err gopher.r-36.net 70 i buttons[i].func(c, buttons[i].click == ClkLink && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); Err gopher.r-36.net 70 i return true; Err gopher.r-36.net 70 i@@ -340,11 +340,11 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i cleanup(void) { Err gopher.r-36.net 70 i- if(diskcache) { Err gopher.r-36.net 70 i+ if (diskcache) { Err gopher.r-36.net 70 i soup_cache_flush(diskcache); Err gopher.r-36.net 70 i soup_cache_dump(diskcache); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- while(clients) Err gopher.r-36.net 70 i+ while (clients) Err gopher.r-36.net 70 i destroyclient(clients); Err gopher.r-36.net 70 i g_free(cookiefile); Err gopher.r-36.net 70 i g_free(scriptfile); Err gopher.r-36.net 70 i@@ -355,7 +355,7 @@ static void Err gopher.r-36.net 70 i cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, Err gopher.r-36.net 70 i SoupCookie *new_cookie) { Err gopher.r-36.net 70 i flock(COOKIEJAR(self)->lock, LOCK_EX); Err gopher.r-36.net 70 i- if(new_cookie && !new_cookie->expires && sessiontime) { Err gopher.r-36.net 70 i+ if (new_cookie && !new_cookie->expires && sessiontime) { Err gopher.r-36.net 70 i soup_cookie_set_expires(new_cookie, Err gopher.r-36.net 70 i soup_date_new_from_now(sessiontime)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -405,7 +405,7 @@ cookiejar_set_property(GObject *self, guint prop_id, const GValue *value, Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static SoupCookieJarAcceptPolicy Err gopher.r-36.net 70 i cookiepolicy_get(void) { Err gopher.r-36.net 70 i- switch(cookiepolicies[policysel]) { Err gopher.r-36.net 70 i+ switch (cookiepolicies[policysel]) { Err gopher.r-36.net 70 i case 'a': Err gopher.r-36.net 70 i return SOUP_COOKIE_JAR_ACCEPT_NEVER; Err gopher.r-36.net 70 i case '@': Err gopher.r-36.net 70 i@@ -420,7 +420,7 @@ cookiepolicy_get(void) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static char Err gopher.r-36.net 70 i cookiepolicy_set(const SoupCookieJarAcceptPolicy ep) { Err gopher.r-36.net 70 i- switch(ep) { Err gopher.r-36.net 70 i+ switch (ep) { Err gopher.r-36.net 70 i case SOUP_COOKIE_JAR_ACCEPT_NEVER: Err gopher.r-36.net 70 i return 'a'; Err gopher.r-36.net 70 i case SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY: Err gopher.r-36.net 70 i@@ -451,7 +451,7 @@ runscript(WebKitWebFrame *frame) { Err gopher.r-36.net 70 i char *script; Err gopher.r-36.net 70 i GError *error; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(g_file_get_contents(scriptfile, &script, NULL, &error)) { Err gopher.r-36.net 70 i+ if (g_file_get_contents(scriptfile, &script, NULL, &error)) { Err gopher.r-36.net 70 i evalscript(webkit_web_frame_get_global_context(frame), Err gopher.r-36.net 70 i script, scriptfile); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -461,7 +461,7 @@ static void Err gopher.r-36.net 70 i clipboard(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i gboolean paste = *(gboolean *)arg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(paste) { Err gopher.r-36.net 70 i+ if (paste) { Err gopher.r-36.net 70 i gtk_clipboard_request_text( Err gopher.r-36.net 70 i gtk_clipboard_get(GDK_SELECTION_PRIMARY), Err gopher.r-36.net 70 i pasteuri, c); Err gopher.r-36.net 70 i@@ -477,7 +477,7 @@ copystr(char **str, const char *src) { Err gopher.r-36.net 70 i char *tmp; Err gopher.r-36.net 70 i tmp = g_strdup(src); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(str && *str) { Err gopher.r-36.net 70 i+ if (str && *str) { Err gopher.r-36.net 70 i g_free(*str); Err gopher.r-36.net 70 i *str = tmp; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -493,7 +493,7 @@ createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) { Err gopher.r-36.net 70 i static gboolean Err gopher.r-36.net 70 i decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, Err gopher.r-36.net 70 i gchar *m, WebKitWebPolicyDecision *p, Client *c) { Err gopher.r-36.net 70 i- if(!webkit_web_view_can_show_mime_type(v, m)) { Err gopher.r-36.net 70 i+ if (!webkit_web_view_can_show_mime_type(v, m)) { Err gopher.r-36.net 70 i webkit_web_policy_decision_download(p); Err gopher.r-36.net 70 i return TRUE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -506,7 +506,7 @@ decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, Err gopher.r-36.net 70 i Client *c) { Err gopher.r-36.net 70 i Arg arg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(webkit_web_navigation_action_get_reason(n) == Err gopher.r-36.net 70 i+ if (webkit_web_navigation_action_get_reason(n) == Err gopher.r-36.net 70 i WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) { Err gopher.r-36.net 70 i webkit_web_policy_decision_ignore(p); Err gopher.r-36.net 70 i arg.v = (void *)webkit_network_request_get_uri(r); Err gopher.r-36.net 70 i@@ -532,14 +532,14 @@ destroyclient(Client *c) { Err gopher.r-36.net 70 i gtk_widget_destroy(c->vbox); Err gopher.r-36.net 70 i gtk_widget_destroy(c->win); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(p = clients; p && p->next != c; p = p->next); Err gopher.r-36.net 70 i- if(p) { Err gopher.r-36.net 70 i+ for (p = clients; p && p->next != c; p = p->next); Err gopher.r-36.net 70 i+ if (p) { Err gopher.r-36.net 70 i p->next = c->next; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i clients = c->next; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i free(c); Err gopher.r-36.net 70 i- if(clients == NULL) Err gopher.r-36.net 70 i+ if (clients == NULL) Err gopher.r-36.net 70 i gtk_main_quit(); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -569,7 +569,7 @@ find(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i fullscreen(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i- if(c->fullscreen) { Err gopher.r-36.net 70 i+ if (c->fullscreen) { Err gopher.r-36.net 70 i gtk_window_unfullscreen(GTK_WINDOW(c->win)); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i gtk_window_fullscreen(GTK_WINDOW(c->win)); Err gopher.r-36.net 70 i@@ -580,7 +580,7 @@ fullscreen(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f, Err gopher.r-36.net 70 i WebKitGeolocationPolicyDecision *d, Client *c) { Err gopher.r-36.net 70 i- if(allowgeolocation) { Err gopher.r-36.net 70 i+ if (allowgeolocation) { Err gopher.r-36.net 70 i webkit_geolocation_policy_allow(d); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i webkit_geolocation_policy_deny(d); Err gopher.r-36.net 70 i@@ -598,7 +598,7 @@ getatom(Client *c, int a) { Err gopher.r-36.net 70 i XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), Err gopher.r-36.net 70 i atoms[a], 0L, BUFSIZ, False, XA_STRING, Err gopher.r-36.net 70 i &adummy, &idummy, &ldummy, &ldummy, &p); Err gopher.r-36.net 70 i- if(p) { Err gopher.r-36.net 70 i+ if (p) { Err gopher.r-36.net 70 i strncpy(buf, (char *)p, LENGTH(buf)-1); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i buf[0] = '\0'; Err gopher.r-36.net 70 i@@ -612,7 +612,7 @@ static char * Err gopher.r-36.net 70 i geturi(Client *c) { Err gopher.r-36.net 70 i char *uri; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!(uri = (char *)webkit_web_view_get_uri(c->view))) Err gopher.r-36.net 70 i+ if (!(uri = (char *)webkit_web_view_get_uri(c->view))) Err gopher.r-36.net 70 i uri = "about:blank"; Err gopher.r-36.net 70 i return uri; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -621,11 +621,11 @@ static gchar * Err gopher.r-36.net 70 i getstyle(const char *uri) { Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(stylefile != NULL) Err gopher.r-36.net 70 i+ if (stylefile != NULL) Err gopher.r-36.net 70 i return g_strconcat("file://", stylefile, NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0; i < LENGTH(styles); i++) { Err gopher.r-36.net 70 i- if(styles[i].regex && !regexec(&(styles[i].re), uri, 0, Err gopher.r-36.net 70 i+ for (i = 0; i < LENGTH(styles); i++) { Err gopher.r-36.net 70 i+ if (styles[i].regex && !regexec(&(styles[i].re), uri, 0, Err gopher.r-36.net 70 i NULL, 0)) { Err gopher.r-36.net 70 i return g_strconcat("file://", styles[i].style, NULL); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -654,7 +654,7 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i inspector(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i- if(c->isinspecting) { Err gopher.r-36.net 70 i+ if (c->isinspecting) { Err gopher.r-36.net 70 i webkit_web_inspector_close(c->inspector); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i webkit_web_inspector_show(c->inspector); Err gopher.r-36.net 70 i@@ -670,7 +670,7 @@ static gboolean Err gopher.r-36.net 70 i inspector_show(WebKitWebInspector *i, Client *c) { Err gopher.r-36.net 70 i WebKitWebView *w; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(c->isinspecting) Err gopher.r-36.net 70 i+ if (c->isinspecting) Err gopher.r-36.net 70 i return false; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i w = webkit_web_inspector_get_web_view(i); Err gopher.r-36.net 70 i@@ -685,7 +685,7 @@ static gboolean Err gopher.r-36.net 70 i inspector_close(WebKitWebInspector *i, Client *c) { Err gopher.r-36.net 70 i GtkWidget *w; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!c->isinspecting) Err gopher.r-36.net 70 i+ if (!c->isinspecting) Err gopher.r-36.net 70 i return false; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i w = GTK_WIDGET(webkit_web_inspector_get_web_view(i)); Err gopher.r-36.net 70 i@@ -710,8 +710,8 @@ keypress(GtkAccelGroup *group, GObject *obj, Err gopher.r-36.net 70 i mods = CLEANMASK(mods); Err gopher.r-36.net 70 i key = gdk_keyval_to_lower(key); Err gopher.r-36.net 70 i updatewinid(c); Err gopher.r-36.net 70 i- for(i = 0; i < LENGTH(keys); i++) { Err gopher.r-36.net 70 i- if(key == keys[i].keyval Err gopher.r-36.net 70 i+ for (i = 0; i < LENGTH(keys); i++) { Err gopher.r-36.net 70 i+ if (key == keys[i].keyval Err gopher.r-36.net 70 i && mods == keys[i].mod Err gopher.r-36.net 70 i && keys[i].func) { Err gopher.r-36.net 70 i keys[i].func(c, &(keys[i].arg)); Err gopher.r-36.net 70 i@@ -724,9 +724,9 @@ keypress(GtkAccelGroup *group, GObject *obj, Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) { Err gopher.r-36.net 70 i- if(l) { Err gopher.r-36.net 70 i+ if (l) { Err gopher.r-36.net 70 i c->linkhover = copystr(&c->linkhover, l); Err gopher.r-36.net 70 i- } else if(c->linkhover) { Err gopher.r-36.net 70 i+ } else if (c->linkhover) { Err gopher.r-36.net 70 i free(c->linkhover); Err gopher.r-36.net 70 i c->linkhover = NULL; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -742,10 +742,10 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i SoupMessage *msg; Err gopher.r-36.net 70 i char *uri; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- switch(webkit_web_view_get_load_status (c->view)) { Err gopher.r-36.net 70 i+ switch (webkit_web_view_get_load_status (c->view)) { Err gopher.r-36.net 70 i case WEBKIT_LOAD_COMMITTED: Err gopher.r-36.net 70 i uri = geturi(c); Err gopher.r-36.net 70 i- if(strstr(uri, "https://") == uri) { Err gopher.r-36.net 70 i+ if (strstr(uri, "https://") == uri) { Err gopher.r-36.net 70 i frame = webkit_web_view_get_main_frame(c->view); Err gopher.r-36.net 70 i src = webkit_web_frame_get_data_source(frame); Err gopher.r-36.net 70 i request = webkit_web_data_source_get_request(src); Err gopher.r-36.net 70 i@@ -755,7 +755,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i setatom(c, AtomUri, uri); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(enablestyles) { Err gopher.r-36.net 70 i+ if (enablestyles) { Err gopher.r-36.net 70 i g_object_set(G_OBJECT(set), "user-stylesheet-uri", Err gopher.r-36.net 70 i getstyle(uri), NULL); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -763,7 +763,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { Err gopher.r-36.net 70 i case WEBKIT_LOAD_FINISHED: Err gopher.r-36.net 70 i c->progress = 100; Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 i- if(diskcache) { Err gopher.r-36.net 70 i+ if (diskcache) { Err gopher.r-36.net 70 i soup_cache_flush(diskcache); Err gopher.r-36.net 70 i soup_cache_dump(diskcache); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -780,11 +780,11 @@ loaduri(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i Arg a = { .b = FALSE }; Err gopher.r-36.net 70 i struct stat st; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(strcmp(uri, "") == 0) Err gopher.r-36.net 70 i+ if (strcmp(uri, "") == 0) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* In case it's a file path. */ Err gopher.r-36.net 70 i- if(stat(uri, &st) == 0) { Err gopher.r-36.net 70 i+ if (stat(uri, &st) == 0) { Err gopher.r-36.net 70 i rp = realpath(uri, NULL); Err gopher.r-36.net 70 i u = g_strdup_printf("file://%s", rp); Err gopher.r-36.net 70 i free(rp); Err gopher.r-36.net 70 i@@ -796,7 +796,7 @@ loaduri(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i setatom(c, AtomUri, uri); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* prevents endless loop */ Err gopher.r-36.net 70 i- if(strcmp(u, geturi(c)) == 0) { Err gopher.r-36.net 70 i+ if (strcmp(u, geturi(c)) == 0) { Err gopher.r-36.net 70 i reload(c, &a); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i webkit_web_view_load_uri(c->view, u); Err gopher.r-36.net 70 i@@ -823,14 +823,14 @@ newclient(void) { Err gopher.r-36.net 70 i gdouble dpi; Err gopher.r-36.net 70 i char *ua; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!(c = calloc(1, sizeof(Client)))) Err gopher.r-36.net 70 i+ if (!(c = calloc(1, sizeof(Client)))) Err gopher.r-36.net 70 i die("Cannot malloc!\n"); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i c->title = NULL; Err gopher.r-36.net 70 i c->progress = 100; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Window */ Err gopher.r-36.net 70 i- if(embed) { Err gopher.r-36.net 70 i+ if (embed) { Err gopher.r-36.net 70 i c->win = gtk_plug_new(embed); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL); Err gopher.r-36.net 70 i@@ -857,7 +857,7 @@ newclient(void) { Err gopher.r-36.net 70 i "leave_notify_event", Err gopher.r-36.net 70 i G_CALLBACK(titlechangeleave), c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!kioskmode) Err gopher.r-36.net 70 i+ if (!kioskmode) Err gopher.r-36.net 70 i addaccelgroup(c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Pane */ Err gopher.r-36.net 70 i@@ -920,7 +920,7 @@ newclient(void) { Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(frame), "scrollbars-policy-changed", Err gopher.r-36.net 70 i G_CALLBACK(gtk_true), NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!enablescrollbars) { Err gopher.r-36.net 70 i+ if (!enablescrollbars) { Err gopher.r-36.net 70 i gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), Err gopher.r-36.net 70 i GTK_POLICY_NEVER, GTK_POLICY_NEVER); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i@@ -951,7 +951,7 @@ newclient(void) { Err gopher.r-36.net 70 i runscript(frame); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i settings = webkit_web_view_get_settings(c->view); Err gopher.r-36.net 70 i- if(!(ua = getenv("SURF_USERAGENT"))) Err gopher.r-36.net 70 i+ if (!(ua = getenv("SURF_USERAGENT"))) Err gopher.r-36.net 70 i ua = useragent; Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), "user-agent", ua, NULL); Err gopher.r-36.net 70 i if (enablestyles) { Err gopher.r-36.net 70 i@@ -980,20 +980,20 @@ newclient(void) { Err gopher.r-36.net 70 i * This ensures websites are not unusably small with a high DPI screen. Err gopher.r-36.net 70 i * It is equivalent to firefox's "layout.css.devPixelsPerPx" setting. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- if(zoomto96dpi) { Err gopher.r-36.net 70 i+ if (zoomto96dpi) { Err gopher.r-36.net 70 i screen = gdk_window_get_screen(GTK_WIDGET(c->win)->window); Err gopher.r-36.net 70 i dpi = gdk_screen_get_resolution(screen); Err gopher.r-36.net 70 i- if(dpi != -1) { Err gopher.r-36.net 70 i+ if (dpi != -1) { Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), "enforce-96-dpi", true, Err gopher.r-36.net 70 i NULL); Err gopher.r-36.net 70 i webkit_web_view_set_zoom_level(c->view, dpi/96); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i /* This might conflict with _zoomto96dpi_. */ Err gopher.r-36.net 70 i- if(zoomlevel != 1.0) Err gopher.r-36.net 70 i+ if (zoomlevel != 1.0) Err gopher.r-36.net 70 i webkit_web_view_set_zoom_level(c->view, zoomlevel); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(enableinspector) { Err gopher.r-36.net 70 i+ if (enableinspector) { Err gopher.r-36.net 70 i c->inspector = WEBKIT_WEB_INSPECTOR( Err gopher.r-36.net 70 i webkit_web_view_get_inspector(c->view)); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view", Err gopher.r-36.net 70 i@@ -1007,20 +1007,20 @@ newclient(void) { Err gopher.r-36.net 70 i c->isinspecting = false; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(runinfullscreen) { Err gopher.r-36.net 70 i+ if (runinfullscreen) { Err gopher.r-36.net 70 i c->fullscreen = 0; Err gopher.r-36.net 70 i fullscreen(c, NULL); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i setatom(c, AtomFind, ""); Err gopher.r-36.net 70 i setatom(c, AtomUri, "about:blank"); Err gopher.r-36.net 70 i- if(hidebackground) Err gopher.r-36.net 70 i+ if (hidebackground) Err gopher.r-36.net 70 i webkit_web_view_set_transparent(c->view, TRUE); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i c->next = clients; Err gopher.r-36.net 70 i clients = c; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(showxid) { Err gopher.r-36.net 70 i+ if (showxid) { Err gopher.r-36.net 70 i gdk_display_sync(gtk_widget_get_display(c->win)); Err gopher.r-36.net 70 i printf("%u\n", Err gopher.r-36.net 70 i (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window)); Err gopher.r-36.net 70 i@@ -1043,32 +1043,32 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) { Err gopher.r-36.net 70 i cmd[i++] = argv0; Err gopher.r-36.net 70 i cmd[i++] = "-a"; Err gopher.r-36.net 70 i cmd[i++] = cookiepolicies; Err gopher.r-36.net 70 i- if(!enablescrollbars) Err gopher.r-36.net 70 i+ if (!enablescrollbars) Err gopher.r-36.net 70 i cmd[i++] = "-b"; Err gopher.r-36.net 70 i- if(embed && !noembed) { Err gopher.r-36.net 70 i+ if (embed && !noembed) { Err gopher.r-36.net 70 i cmd[i++] = "-e"; Err gopher.r-36.net 70 i snprintf(tmp, LENGTH(tmp), "%u", (int)embed); Err gopher.r-36.net 70 i cmd[i++] = tmp; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(!allowgeolocation) Err gopher.r-36.net 70 i+ if (!allowgeolocation) Err gopher.r-36.net 70 i cmd[i++] = "-g"; Err gopher.r-36.net 70 i- if(!loadimages) Err gopher.r-36.net 70 i+ if (!loadimages) Err gopher.r-36.net 70 i cmd[i++] = "-i"; Err gopher.r-36.net 70 i- if(kioskmode) Err gopher.r-36.net 70 i+ if (kioskmode) Err gopher.r-36.net 70 i cmd[i++] = "-k"; Err gopher.r-36.net 70 i- if(!enableplugins) Err gopher.r-36.net 70 i+ if (!enableplugins) Err gopher.r-36.net 70 i cmd[i++] = "-p"; Err gopher.r-36.net 70 i- if(!enablescripts) Err gopher.r-36.net 70 i+ if (!enablescripts) Err gopher.r-36.net 70 i cmd[i++] = "-s"; Err gopher.r-36.net 70 i- if(showxid) Err gopher.r-36.net 70 i+ if (showxid) Err gopher.r-36.net 70 i cmd[i++] = "-x"; Err gopher.r-36.net 70 i- if(enablediskcache) Err gopher.r-36.net 70 i+ if (enablediskcache) Err gopher.r-36.net 70 i cmd[i++] = "-D"; Err gopher.r-36.net 70 i cmd[i++] = "-c"; Err gopher.r-36.net 70 i cmd[i++] = cookiefile; Err gopher.r-36.net 70 i cmd[i++] = "--"; Err gopher.r-36.net 70 i uri = arg->v ? (char *)arg->v : c->linkhover; Err gopher.r-36.net 70 i- if(uri) Err gopher.r-36.net 70 i+ if (uri) Err gopher.r-36.net 70 i cmd[i++] = uri; Err gopher.r-36.net 70 i cmd[i++] = NULL; Err gopher.r-36.net 70 i spawn(NULL, &a); Err gopher.r-36.net 70 i@@ -1079,7 +1079,7 @@ contextmenu(WebKitWebView *view, GtkWidget *menu, WebKitHitTestResult *target, Err gopher.r-36.net 70 i gboolean keyboard, Client *c) { Err gopher.r-36.net 70 i GList *items = gtk_container_get_children(GTK_CONTAINER(GTK_MENU(menu))); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(GList *l = items; l; l = l->next) { Err gopher.r-36.net 70 i+ for (GList *l = items; l; l = l->next) { Err gopher.r-36.net 70 i g_signal_connect(l->data, "activate", G_CALLBACK(menuactivate), c); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1106,18 +1106,18 @@ menuactivate(GtkMenuItem *item, Client *c) { Err gopher.r-36.net 70 i GtkClipboard *prisel, *clpbrd; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i a = gtk_activatable_get_related_action(GTK_ACTIVATABLE(item)); Err gopher.r-36.net 70 i- if(a == NULL) Err gopher.r-36.net 70 i+ if (a == NULL) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i name = gtk_action_get_name(a); Err gopher.r-36.net 70 i- if(!g_strcmp0(name, "context-menu-action-3")) { Err gopher.r-36.net 70 i+ if (!g_strcmp0(name, "context-menu-action-3")) { Err gopher.r-36.net 70 i prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY); Err gopher.r-36.net 70 i gtk_clipboard_set_text(prisel, c->linkhover, -1); Err gopher.r-36.net 70 i- } else if(!g_strcmp0(name, "context-menu-action-7")) { Err gopher.r-36.net 70 i+ } else if (!g_strcmp0(name, "context-menu-action-7")) { Err gopher.r-36.net 70 i prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY); Err gopher.r-36.net 70 i clpbrd = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); Err gopher.r-36.net 70 i uri = gtk_clipboard_wait_for_text(clpbrd); Err gopher.r-36.net 70 i- if(uri) Err gopher.r-36.net 70 i+ if (uri) Err gopher.r-36.net 70 i gtk_clipboard_set_text(prisel, uri, -1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1125,7 +1125,7 @@ menuactivate(GtkMenuItem *item, Client *c) { Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) { Err gopher.r-36.net 70 i Arg arg = {.v = text }; Err gopher.r-36.net 70 i- if(text != NULL) Err gopher.r-36.net 70 i+ if (text != NULL) Err gopher.r-36.net 70 i loaduri((Client *) d, &arg); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1140,15 +1140,15 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { Err gopher.r-36.net 70 i XPropertyEvent *ev; Err gopher.r-36.net 70 i Arg arg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(((XEvent *)e)->type == PropertyNotify) { Err gopher.r-36.net 70 i+ if (((XEvent *)e)->type == PropertyNotify) { Err gopher.r-36.net 70 i ev = &((XEvent *)e)->xproperty; Err gopher.r-36.net 70 i- if(ev->state == PropertyNewValue) { Err gopher.r-36.net 70 i- if(ev->atom == atoms[AtomFind]) { Err gopher.r-36.net 70 i+ if (ev->state == PropertyNewValue) { Err gopher.r-36.net 70 i+ if (ev->atom == atoms[AtomFind]) { Err gopher.r-36.net 70 i arg.b = TRUE; Err gopher.r-36.net 70 i find(c, &arg); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i return GDK_FILTER_REMOVE; Err gopher.r-36.net 70 i- } else if(ev->atom == atoms[AtomGo]) { Err gopher.r-36.net 70 i+ } else if (ev->atom == atoms[AtomGo]) { Err gopher.r-36.net 70 i arg.v = getatom(c, AtomGo); Err gopher.r-36.net 70 i loaduri(c, &arg); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1178,7 +1178,7 @@ linkopenembed(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i reload(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i gboolean nocache = *(gboolean *)arg; Err gopher.r-36.net 70 i- if(nocache) { Err gopher.r-36.net 70 i+ if (nocache) { Err gopher.r-36.net 70 i webkit_web_view_reload_bypass_cache(c->view); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i webkit_web_view_reload(c->view); Err gopher.r-36.net 70 i@@ -1202,7 +1202,7 @@ scroll(GtkAdjustment *a, const Arg *arg) { Err gopher.r-36.net 70 i gdouble v; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i v = gtk_adjustment_get_value(a); Err gopher.r-36.net 70 i- switch(arg->i) { Err gopher.r-36.net 70 i+ switch (arg->i) { Err gopher.r-36.net 70 i case +10000: Err gopher.r-36.net 70 i case -10000: Err gopher.r-36.net 70 i v += gtk_adjustment_get_page_increment(a) * Err gopher.r-36.net 70 i@@ -1253,9 +1253,9 @@ setup(void) { Err gopher.r-36.net 70 i scriptfile = buildfile(scriptfile); Err gopher.r-36.net 70 i cachefolder = buildpath(cachefolder); Err gopher.r-36.net 70 i styledir = buildpath(styledir); Err gopher.r-36.net 70 i- if(stylefile == NULL) { Err gopher.r-36.net 70 i- for(i = 0; i < LENGTH(styles); i++) { Err gopher.r-36.net 70 i- if(regcomp(&(styles[i].re), styles[i].regex, Err gopher.r-36.net 70 i+ if (stylefile == NULL) { Err gopher.r-36.net 70 i+ for (i = 0; i < LENGTH(styles); i++) { Err gopher.r-36.net 70 i+ if (regcomp(&(styles[i].re), styles[i].regex, Err gopher.r-36.net 70 i REG_EXTENDED)) { Err gopher.r-36.net 70 i fprintf(stderr, Err gopher.r-36.net 70 i "Could not compile regex: %s\n", Err gopher.r-36.net 70 i@@ -1279,7 +1279,7 @@ setup(void) { Err gopher.r-36.net 70 i cookiepolicy_get()))); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* disk cache */ Err gopher.r-36.net 70 i- if(enablediskcache) { Err gopher.r-36.net 70 i+ if (enablediskcache) { Err gopher.r-36.net 70 i diskcache = soup_cache_new(cachefolder, SOUP_CACHE_SINGLE_USER); Err gopher.r-36.net 70 i soup_cache_set_max_size(diskcache, diskcachebytes); Err gopher.r-36.net 70 i soup_cache_load(diskcache); Err gopher.r-36.net 70 i@@ -1289,7 +1289,7 @@ setup(void) { Err gopher.r-36.net 70 i /* ssl */ Err gopher.r-36.net 70 i tlsdb = g_tls_file_database_new(cafile, &error); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(error) { Err gopher.r-36.net 70 i+ if (error) { Err gopher.r-36.net 70 i g_warning("Error loading SSL database %s: %s", cafile, error->message); Err gopher.r-36.net 70 i g_error_free(error); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1297,7 +1297,7 @@ setup(void) { Err gopher.r-36.net 70 i g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* proxy */ Err gopher.r-36.net 70 i- if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) { Err gopher.r-36.net 70 i+ if ((proxy = getenv("http_proxy")) && strcmp(proxy, "")) { Err gopher.r-36.net 70 i new_proxy = g_strrstr(proxy, "http://") Err gopher.r-36.net 70 i || g_strrstr(proxy, "socks://") Err gopher.r-36.net 70 i || g_strrstr(proxy, "socks4://") Err gopher.r-36.net 70 i@@ -1314,9 +1314,9 @@ setup(void) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i sigchld(int unused) { Err gopher.r-36.net 70 i- if(signal(SIGCHLD, sigchld) == SIG_ERR) Err gopher.r-36.net 70 i+ if (signal(SIGCHLD, sigchld) == SIG_ERR) Err gopher.r-36.net 70 i die("Can't install SIGCHLD handler"); Err gopher.r-36.net 70 i- while(0 < waitpid(-1, NULL, WNOHANG)); Err gopher.r-36.net 70 i+ while (0 < waitpid(-1, NULL, WNOHANG)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i@@ -1331,8 +1331,8 @@ source(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i spawn(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i- if(fork() == 0) { Err gopher.r-36.net 70 i- if(dpy) Err gopher.r-36.net 70 i+ if (fork() == 0) { Err gopher.r-36.net 70 i+ if (dpy) Err gopher.r-36.net 70 i close(ConnectionNumber(dpy)); Err gopher.r-36.net 70 i setsid(); Err gopher.r-36.net 70 i execvp(((char **)arg->v)[0], (char **)arg->v); Err gopher.r-36.net 70 i@@ -1395,7 +1395,7 @@ togglecookiepolicy(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i g_object_get(G_OBJECT(jar), "accept-policy", &policy, NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i policysel++; Err gopher.r-36.net 70 i- if(policysel >= strlen(cookiepolicies)) Err gopher.r-36.net 70 i+ if (policysel >= strlen(cookiepolicies)) Err gopher.r-36.net 70 i policysel = 0; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i g_object_set(G_OBJECT(jar), "accept-policy", Err gopher.r-36.net 70 i@@ -1439,7 +1439,7 @@ togglescrollbars(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(c->scroll), NULL, &vspolicy); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(vspolicy == GTK_POLICY_AUTOMATIC) { Err gopher.r-36.net 70 i+ if (vspolicy == GTK_POLICY_AUTOMATIC) { Err gopher.r-36.net 70 i gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll), Err gopher.r-36.net 70 i GTK_POLICY_NEVER, GTK_POLICY_NEVER); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i@@ -1498,7 +1498,7 @@ static void Err gopher.r-36.net 70 i getpagestat(Client *c) { Err gopher.r-36.net 70 i const char *uri = geturi(c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(strstr(uri, "https://") == uri) { Err gopher.r-36.net 70 i+ if (strstr(uri, "https://") == uri) { Err gopher.r-36.net 70 i pagestat[0] = c->sslfailed ? 'U' : 'T'; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i pagestat[0] = '-'; Err gopher.r-36.net 70 i@@ -1513,14 +1513,14 @@ static void Err gopher.r-36.net 70 i updatetitle(Client *c) { Err gopher.r-36.net 70 i char *t; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(showindicators) { Err gopher.r-36.net 70 i+ if (showindicators) { Err gopher.r-36.net 70 i gettogglestat(c); Err gopher.r-36.net 70 i getpagestat(c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(c->linkhover) { Err gopher.r-36.net 70 i+ if (c->linkhover) { Err gopher.r-36.net 70 i t = g_strdup_printf("%s:%s | %s", togglestat, Err gopher.r-36.net 70 i pagestat, c->linkhover); Err gopher.r-36.net 70 i- } else if(c->progress != 100) { Err gopher.r-36.net 70 i+ } else if (c->progress != 100) { Err gopher.r-36.net 70 i t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress, Err gopher.r-36.net 70 i togglestat, pagestat, Err gopher.r-36.net 70 i (c->title == NULL)? "" : c->title); Err gopher.r-36.net 70 i@@ -1561,10 +1561,10 @@ windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js, Err gopher.r-36.net 70 i static void Err gopher.r-36.net 70 i zoom(Client *c, const Arg *arg) { Err gopher.r-36.net 70 i c->zoomed = TRUE; Err gopher.r-36.net 70 i- if(arg->i < 0) { Err gopher.r-36.net 70 i+ if (arg->i < 0) { Err gopher.r-36.net 70 i /* zoom out */ Err gopher.r-36.net 70 i webkit_web_view_zoom_out(c->view); Err gopher.r-36.net 70 i- } else if(arg->i > 0) { Err gopher.r-36.net 70 i+ } else if (arg->i > 0) { Err gopher.r-36.net 70 i /* zoom in */ Err gopher.r-36.net 70 i webkit_web_view_zoom_in(c->view); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i@@ -1673,12 +1673,12 @@ main(int argc, char *argv[]) { Err gopher.r-36.net 70 i default: Err gopher.r-36.net 70 i usage(); Err gopher.r-36.net 70 i } ARGEND; Err gopher.r-36.net 70 i- if(argc > 0) Err gopher.r-36.net 70 i+ if (argc > 0) Err gopher.r-36.net 70 i arg.v = argv[0]; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i setup(); Err gopher.r-36.net 70 i c = newclient(); Err gopher.r-36.net 70 i- if(arg.v) { Err gopher.r-36.net 70 i+ if (arg.v) { Err gopher.r-36.net 70 i loaduri(clients, &arg); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 .