[wiki] [sites] [surf][omnibar] patch update: applies cleanly || clamiax

[git]

commit 6023fe9fc927e047d0c937a062a45a9d9d345063
Author: clamiax <smo...@gmail.com>
Date:   Fri Oct 23 13:27:01 2015 +0200

    [surf][omnibar] patch update: applies cleanly

diff --git a/surf.suckless.org/patches/surf-0.6-omnibar.diff 
b/surf.suckless.org/patches/surf-0.6-omnibar.diff
index 8bd7bab..20f4860 100644
--- a/surf.suckless.org/patches/surf-0.6-omnibar.diff
+++ b/surf.suckless.org/patches/surf-0.6-omnibar.diff
@@ -1,8 +1,8 @@
 diff --git a/config.def.h b/config.def.h
-index 1eb9566..e1f142d 100644
+index 5245129..d8964bc 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -63,6 +63,18 @@ static Bool allowgeolocation      = TRUE;
+@@ -65,6 +65,18 @@ static Bool allowgeolocation      = TRUE;
        } \
  }
  
@@ -21,20 +21,20 @@ index 1eb9566..e1f142d 100644
  /* styles */
  /*
   * The iteration will stop at the first match, beginning at the beginning of
-@@ -110,7 +122,7 @@ static Key keys[] = {
+@@ -112,7 +124,7 @@ static Key keys[] = {
      { MODKEY,               GDK_o,      source,     { 0 } },
      { MODKEY|GDK_SHIFT_MASK,GDK_o,      inspector,  { 0 } },
  
 -    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", 
"_SURF_GO") },
-+    { MODKEY,               GDK_KEY_g,  spawn,      GOTO },
++    { MODKEY,               GDK_g,      spawn,      GOTO },
      { MODKEY,               GDK_f,      spawn,      SETPROP("_SURF_FIND", 
"_SURF_FIND") },
      { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", 
"_SURF_FIND") },
  
 diff --git a/surf.c b/surf.c
-index 02656ec..1ccd821 100644
+index 28bffef..40ae97d 100644
 --- a/surf.c
 +++ b/surf.c
-@@ -712,11 +712,11 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, 
Client *c) {
+@@ -777,11 +777,11 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, 
Client *c)
        WebKitNetworkRequest *request;
        WebKitWebSettings *set = webkit_web_view_get_settings(c->view);
        SoupMessage *msg;
@@ -42,17 +42,17 @@ index 02656ec..1ccd821 100644
 +      char *uri = geturi(c);
 +      Arg arg = (Arg)ONLOAD(uri);
  
-       switch(webkit_web_view_get_load_status (c->view)) {
+       switch (webkit_web_view_get_load_status (c->view)) {
        case WEBKIT_LOAD_COMMITTED:
 -              uri = geturi(c);
-               if(strstr(uri, "https://";) == uri) {
+               if (strstr(uri, "https://";) == uri) {
                        frame = webkit_web_view_get_main_frame(c->view);
                        src = webkit_web_frame_get_data_source(frame);
-@@ -733,6 +733,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, 
Client *c) {
+@@ -798,6 +798,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, 
Client *c)
                }
                break;
        case WEBKIT_LOAD_FINISHED:
 +              spawn(NULL, &arg);
                c->progress = 100;
                updatetitle(c);
-               if(diskcache) {
+               if (diskcache) {