istyle fixes (mainly whitespace) - 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 743fa9f3d19af8166b8466f35c464c402e31f554 /scm/surf//commit/743fa9f3d19af8166b8466f35c464c402e31f554.gph gopher.r-36.net 70 1parent 0ac6bf5a973159117c2457bf27e5c7b554f112ca /scm/surf//commit/0ac6bf5a973159117c2457bf27e5c7b554f112ca.gph gopher.r-36.net 70 hAuthor: Markus Teich URL:mailto:markus.teich@stusta.mhn.de gopher.r-36.net 70 iDate: Mon, 18 Jan 2016 16:08:26 +0100 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 istyle fixes (mainly whitespace) 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 | 72 +++++++++++++++---------------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 34 insertions(+), 38 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@@ -137,10 +137,10 @@ static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Err gopher.r-36.net 70 i Client *c); Err gopher.r-36.net 70 i static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f, Err gopher.r-36.net 70 i WebKitNetworkRequest *r, gchar *m, Err gopher.r-36.net 70 i- WebKitWebPolicyDecision *p, Client *c); Err gopher.r-36.net 70 i+ WebKitWebPolicyDecision *p, Client *c); Err gopher.r-36.net 70 i static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f, Err gopher.r-36.net 70 i WebKitNetworkRequest *r, WebKitWebNavigationAction Err gopher.r-36.net 70 i- *n, WebKitWebPolicyDecision *p, Client *c); Err gopher.r-36.net 70 i+ *n, WebKitWebPolicyDecision *p, Client *c); Err gopher.r-36.net 70 i static gboolean deletion_interface(WebKitWebView *view, Err gopher.r-36.net 70 i WebKitDOMHTMLElement *arg1, Client *c); Err gopher.r-36.net 70 i static void destroyclient(Client *c); Err gopher.r-36.net 70 i@@ -182,7 +182,7 @@ static void newwindow(Client *c, const Arg *arg, gboolean noembed); Err gopher.r-36.net 70 i static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); Err gopher.r-36.net 70 i static gboolean contextmenu(WebKitWebView *view, GtkWidget *menu, Err gopher.r-36.net 70 i WebKitHitTestResult *target, gboolean keyboard, Err gopher.r-36.net 70 i- Client *c); Err gopher.r-36.net 70 i+ Client *c); Err gopher.r-36.net 70 i static void menuactivate(GtkMenuItem *item, Client *c); Err gopher.r-36.net 70 i static void print(Client *c, const Arg *arg); Err gopher.r-36.net 70 i static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, Err gopher.r-36.net 70 i@@ -236,7 +236,7 @@ addaccelgroup(Client *c) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r, Err gopher.r-36.net 70 i WebKitNetworkRequest *req, WebKitNetworkResponse *resp, Err gopher.r-36.net 70 i- Client *c) Err gopher.r-36.net 70 i+ Client *c) Err gopher.r-36.net 70 i { 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@@ -341,7 +341,7 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c) Err gopher.r-36.net 70 i && CLEANMASK(e->state) == CLEANMASK(buttons[i].mask) Err gopher.r-36.net 70 i && buttons[i].func) { Err gopher.r-36.net 70 i buttons[i].func(c, buttons[i].click == ClkLink Err gopher.r-36.net 70 i- && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); Err gopher.r-36.net 70 i+ && 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 } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -373,7 +373,7 @@ cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie, Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i SOUP_COOKIE_JAR_CLASS(cookiejar_parent_class)->changed(self, Err gopher.r-36.net 70 i old_cookie, Err gopher.r-36.net 70 i- new_cookie); Err gopher.r-36.net 70 i+ new_cookie); Err gopher.r-36.net 70 i flock(COOKIEJAR(self)->lock, LOCK_UN); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -407,8 +407,8 @@ cookiejar_new(const char *filename, gboolean read_only, Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i return g_object_new(COOKIEJAR_TYPE, Err gopher.r-36.net 70 i SOUP_COOKIE_JAR_TEXT_FILENAME, filename, Err gopher.r-36.net 70 i- SOUP_COOKIE_JAR_READ_ONLY, read_only, Err gopher.r-36.net 70 i- SOUP_COOKIE_JAR_ACCEPT_POLICY, policy, NULL); Err gopher.r-36.net 70 i+ SOUP_COOKIE_JAR_READ_ONLY, read_only, Err gopher.r-36.net 70 i+ SOUP_COOKIE_JAR_ACCEPT_POLICY, policy, NULL); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i@@ -529,7 +529,7 @@ decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r, Err gopher.r-36.net 70 i gboolean Err gopher.r-36.net 70 i decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, Err gopher.r-36.net 70 i WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Err gopher.r-36.net 70 i- Client *c) Err gopher.r-36.net 70 i+ Client *c) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i Arg arg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -802,7 +802,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) Err gopher.r-36.net 70 i request = webkit_web_data_source_get_request(src); Err gopher.r-36.net 70 i msg = webkit_network_request_get_message(request); Err gopher.r-36.net 70 i c->sslfailed = !(soup_message_get_flags(msg) Err gopher.r-36.net 70 i- & SOUP_MESSAGE_CERTIFICATE_TRUSTED); Err gopher.r-36.net 70 i+ & SOUP_MESSAGE_CERTIFICATE_TRUSTED); 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 c->title = copystr(&c->title, uri); Err gopher.r-36.net 70 i@@ -905,10 +905,10 @@ newclient(void) Err gopher.r-36.net 70 i gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->win), Err gopher.r-36.net 70 i "destroy", Err gopher.r-36.net 70 i- G_CALLBACK(destroywin), c); Err gopher.r-36.net 70 i+ G_CALLBACK(destroywin), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->win), 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+ 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 addaccelgroup(c); Err gopher.r-36.net 70 i@@ -925,46 +925,46 @@ newclient(void) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "notify::title", Err gopher.r-36.net 70 i- G_CALLBACK(titlechange), c); Err gopher.r-36.net 70 i+ G_CALLBACK(titlechange), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "hovering-over-link", Err gopher.r-36.net 70 i- G_CALLBACK(linkhover), c); Err gopher.r-36.net 70 i+ G_CALLBACK(linkhover), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "geolocation-policy-decision-requested", Err gopher.r-36.net 70 i- G_CALLBACK(geopolicyrequested), c); Err gopher.r-36.net 70 i+ G_CALLBACK(geopolicyrequested), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "create-web-view", Err gopher.r-36.net 70 i- G_CALLBACK(createwindow), c); Err gopher.r-36.net 70 i+ G_CALLBACK(createwindow), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "new-window-policy-decision-requested", Err gopher.r-36.net 70 i- G_CALLBACK(decidewindow), c); Err gopher.r-36.net 70 i+ G_CALLBACK(decidewindow), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "mime-type-policy-decision-requested", Err gopher.r-36.net 70 i- G_CALLBACK(decidedownload), c); Err gopher.r-36.net 70 i+ G_CALLBACK(decidedownload), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "window-object-cleared", Err gopher.r-36.net 70 i- G_CALLBACK(windowobjectcleared), c); Err gopher.r-36.net 70 i+ G_CALLBACK(windowobjectcleared), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "notify::load-status", Err gopher.r-36.net 70 i- G_CALLBACK(loadstatuschange), c); Err gopher.r-36.net 70 i+ G_CALLBACK(loadstatuschange), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "notify::progress", Err gopher.r-36.net 70 i- G_CALLBACK(progresschange), c); Err gopher.r-36.net 70 i+ G_CALLBACK(progresschange), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "download-requested", Err gopher.r-36.net 70 i- G_CALLBACK(initdownload), c); Err gopher.r-36.net 70 i+ G_CALLBACK(initdownload), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "button-release-event", Err gopher.r-36.net 70 i- G_CALLBACK(buttonrelease), c); Err gopher.r-36.net 70 i+ G_CALLBACK(buttonrelease), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "context-menu", Err gopher.r-36.net 70 i- G_CALLBACK(contextmenu), c); Err gopher.r-36.net 70 i+ G_CALLBACK(contextmenu), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "resource-request-starting", Err gopher.r-36.net 70 i- G_CALLBACK(beforerequest), c); Err gopher.r-36.net 70 i+ G_CALLBACK(beforerequest), c); Err gopher.r-36.net 70 i g_signal_connect(G_OBJECT(c->view), Err gopher.r-36.net 70 i "should-show-delete-interface-for-element", Err gopher.r-36.net 70 i- G_CALLBACK(deletion_interface), c); Err gopher.r-36.net 70 i+ G_CALLBACK(deletion_interface), c); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Scrolled Window */ Err gopher.r-36.net 70 i c->scroll = gtk_scrolled_window_new(NULL, NULL); Err gopher.r-36.net 70 i@@ -976,11 +976,11 @@ newclient(void) 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, Err gopher.r-36.net 70 i- GTK_POLICY_NEVER); Err gopher.r-36.net 70 i+ GTK_POLICY_NEVER); Err gopher.r-36.net 70 i } else { 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_AUTOMATIC, Err gopher.r-36.net 70 i- GTK_POLICY_AUTOMATIC); Err gopher.r-36.net 70 i+ GTK_POLICY_AUTOMATIC); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Arranging */ Err gopher.r-36.net 70 i@@ -1016,7 +1016,7 @@ newclient(void) Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i "enable-scripts", enablescripts, NULL); Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i- "enable-spatial-navigation", enablespatialbrowsing, NULL); Err gopher.r-36.net 70 i+ "enable-spatial-navigation", enablespatialbrowsing, NULL); Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i "enable-developer-extras", enableinspector, NULL); Err gopher.r-36.net 70 i g_object_set(G_OBJECT(settings), Err gopher.r-36.net 70 i@@ -1075,9 +1075,8 @@ newclient(void) 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 fflush(NULL); Err gopher.r-36.net 70 i- if (fclose(stdout) != 0) { Err gopher.r-36.net 70 i+ if (fclose(stdout) != 0) Err gopher.r-36.net 70 i die("Error closing stdout"); Err gopher.r-36.net 70 i- } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i return c; Err gopher.r-36.net 70 i@@ -1201,12 +1200,10 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) 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 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 return GDK_FILTER_REMOVE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1372,7 +1369,7 @@ setup(void) 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 new_proxy = g_strrstr(proxy, "http://") Err gopher.r-36.net 70 i- || g_strrstr(proxy, "https://") Err gopher.r-36.net 70 i+ || g_strrstr(proxy, "https://") 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 || g_strrstr(proxy, "socks4a://") Err gopher.r-36.net 70 i@@ -1380,7 +1377,7 @@ setup(void) Err gopher.r-36.net 70 i ? g_strdup(proxy) Err gopher.r-36.net 70 i : g_strdup_printf("http://%s", proxy); Err gopher.r-36.net 70 i new_no_proxy = ((no_proxy = getenv("no_proxy")) && strcmp(no_proxy, "")) Err gopher.r-36.net 70 i- ? g_strsplit(no_proxy, ",", -1) : NULL; Err gopher.r-36.net 70 i+ ? g_strsplit(no_proxy, ",", -1) : NULL; Err gopher.r-36.net 70 i pr = g_simple_proxy_resolver_new(new_proxy, new_no_proxy); Err gopher.r-36.net 70 i g_object_set(G_OBJECT(s), "proxy-resolver", pr, NULL); Err gopher.r-36.net 70 i g_free(new_proxy); Err gopher.r-36.net 70 i@@ -1539,11 +1536,11 @@ togglescrollbars(Client *c, const Arg *arg) 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, Err gopher.r-36.net 70 i- GTK_POLICY_NEVER); Err gopher.r-36.net 70 i+ GTK_POLICY_NEVER); Err gopher.r-36.net 70 i } else { 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_AUTOMATIC, Err gopher.r-36.net 70 i- GTK_POLICY_AUTOMATIC); Err gopher.r-36.net 70 i+ GTK_POLICY_AUTOMATIC); Err gopher.r-36.net 70 i a.i = +1; Err gopher.r-36.net 70 i twitch(c, &a); Err gopher.r-36.net 70 i a.i = -1; Err gopher.r-36.net 70 i@@ -1556,7 +1553,6 @@ togglestyle(Client *c, const Arg *arg) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i enablestyle = !enablestyle; Err gopher.r-36.net 70 i setstyle(c, enablestyle ? getstyle(geturi(c)) : ""); Err gopher.r-36.net 70 i- Err gopher.r-36.net 70 i updatetitle(c); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 .