[wiki] [sites] [surf][omnibar] Patch against 0.6 stable, not head. || clamiax

[git]

commit 79acae585c2225fe13588aa69b79e8d8ad8bd041
Author: clamiax <smo...@gmail.com>
Date:   Sat Nov 7 13:17:57 2015 +0100

    [surf][omnibar] Patch against 0.6 stable, not head.

diff --git a/surf.suckless.org/patches/surf-0.6-omnibar.diff 
b/surf.suckless.org/patches/surf-0.6-omnibar.diff
index 20f4860..814e6bd 100644
--- a/surf.suckless.org/patches/surf-0.6-omnibar.diff
+++ b/surf.suckless.org/patches/surf-0.6-omnibar.diff
@@ -1,8 +1,7 @@
-diff --git a/config.def.h b/config.def.h
-index 5245129..d8964bc 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -65,6 +65,18 @@ static Bool allowgeolocation      = TRUE;
+diff -wu surf-0.6/config.def.h surf-0.6-edit/config.def.h
+--- surf-0.6/config.def.h      2013-02-10 19:40:14.000000000 +0100
++++ surf-0.6-edit/config.def.h 2015-11-07 13:12:23.854017366 +0100
+@@ -43,6 +43,18 @@
        } \
  }
  
@@ -18,10 +17,10 @@ index 5245129..d8964bc 100644
 +      } \
 +}
 +
- /* styles */
- /*
-  * The iteration will stop at the first match, beginning at the beginning of
-@@ -112,7 +124,7 @@ static Key keys[] = {
+ #define MODKEY GDK_CONTROL_MASK
+ 
+ /* hotkeys */
+@@ -80,7 +92,7 @@
      { MODKEY,               GDK_o,      source,     { 0 } },
      { MODKEY|GDK_SHIFT_MASK,GDK_o,      inspector,  { 0 } },
  
@@ -30,29 +29,31 @@ index 5245129..d8964bc 100644
      { 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 28bffef..40ae97d 100644
---- a/surf.c
-+++ b/surf.c
-@@ -777,11 +777,11 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, 
Client *c)
+Solo in surf-0.6-edit/: config.h
+Solo in surf-0.6-edit/: surf-0.6-omnibar.diff
+diff -wu surf-0.6/surf.c surf-0.6-edit/surf.c
+--- surf-0.6/surf.c    2013-02-10 19:40:14.000000000 +0100
++++ surf-0.6-edit/surf.c       2015-11-07 13:13:24.253997068 +0100
+@@ -588,11 +588,11 @@
+       WebKitWebDataSource *src;
        WebKitNetworkRequest *request;
-       WebKitWebSettings *set = webkit_web_view_get_settings(c->view);
        SoupMessage *msg;
 -      char *uri;
 +      char *uri = geturi(c);
-+      Arg arg = (Arg)ONLOAD(uri);
++      Arg arg;
  
-       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);
-@@ -798,6 +798,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, 
Client *c)
-               }
+@@ -604,6 +604,8 @@
+               setatom(c, AtomUri, uri);
                break;
        case WEBKIT_LOAD_FINISHED:
++              arg = (Arg)ONLOAD(uri);
 +              spawn(NULL, &arg);
                c->progress = 100;
-               updatetitle(c);
-               if (diskcache) {
+               update(c);
+               break;