- updated for refs/tags/2009.09.12

Changed files:
    uzbl-config.patch -> 1.3
    uzbl-dmenu.patch -> 1.2

diff --git a/uzbl-config.patch b/uzbl-config.patch
index 39e9f6f8b3765b25cfa541313a6decfeb7c4ec89..217cc0c237b7d1ae2771de20a87d269b18fe1052 100644 (file)
--- a/uzbl-config.patch
+++ b/uzbl-config.patch
@@ -1,20 +1,26 @@
 diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
-index ab2cf7f..d34795e 100644
+index 47d8839..275c248 100644
 --- a/examples/config/uzbl/config
 +++ b/examples/config/uzbl/config
-@@ -4,9 +4,9 @@
+@@ -4,14 +4,14 @@
  # keyboard behavior in this sample config is sort of vimstyle
  
  # Handlers
--set history_handler  = spawn $XDG_DATA_HOME/uzbl/scripts/history.sh
 -set download_handler = spawn $XDG_DATA_HOME/uzbl/scripts/download.sh
 -set cookie_handler   = spawn $XDG_DATA_HOME/uzbl/scripts/cookies.py
-+set history_handler  = spawn /usr/share/uzbl/scripts/history.sh
 +set download_handler = spawn /usr/share/uzbl/scripts/download.sh
 +set cookie_handler   = spawn /usr/share/uzbl/scripts/cookies.py
  #set new_window      = sh 'echo uri "$8" > $4' # open in same window
  set new_window       = sh 'uzbl -u $8' # equivalent to the default behaviour
- set load_start_handler = set status_message = <span foreground="khaki">wait</span>
+-set scheme_handler   = spawn $XDG_DATA_HOME/uzbl/scripts/scheme.py
++set scheme_handler   = spawn /usr/share/uzbl/scripts/scheme.py
+ set load_start_handler = chain 'set keycmd = ' 'set status_message = <span foreground="khaki">wait</span>'
+ set load_commit_handler = set status_message = <span foreground="green">recv</span>
+-set load_finish_handler = chain 'set status_message = <span foreground="gold">done</span>' 'spawn $XDG_DATA_HOME/uzbl/scripts/history.sh'
++set load_finish_handler = chain 'set status_message = <span foreground="gold">done</span>' 'spawn /usr/share/uzbl/scripts/history.sh'
+ 
+ 
+ 
 @@ -60,6 +60,7 @@ bind    gh        = uri http://www.uzbl.org
  bind    o _       = uri %s
  # shortcut to set variables

diff --git a/uzbl-dmenu.patch b/uzbl-dmenu.patch
index 5d8b21b9dbc9660fc7b9e588a986ad1591b2ba58..f21a4a73bfa20a3801c6f587caf802a9841ef800 100644 (file)
--- a/uzbl-dmenu.patch
+++ b/uzbl-dmenu.patch
@@ -1,5 +1,5 @@
 diff --git a/examples/data/uzbl/scripts/load_url_from_bookmarks.sh b/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
-index f57d7b3..f77dfe4 100755
+index 1e9f9e7..ca49c2b 100755
 --- a/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
 +++ b/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
 @@ -5,16 +5,10 @@
@@ -22,9 +22,9 @@ index f57d7b3..f77dfe4 100755
 +goto=`$DMENU $COLORS < $file | awk '{print $1}'`
  
  #[ -n "$goto" ] && echo "uri $goto" > $4
- [ -n "$goto" ] && uzblctrl -s $5 -c "uri $goto"
+ [ -n "$goto" ] && echo "uri $goto" | socat - unix-connect:$5
 diff --git a/examples/data/uzbl/scripts/load_url_from_history.sh b/examples/data/uzbl/scripts/load_url_from_history.sh
-index 1eaf0f2..ff5e790 100755
+index 62e02ac..756c962 100755
 --- a/examples/data/uzbl/scripts/load_url_from_history.sh
 +++ b/examples/data/uzbl/scripts/load_url_from_history.sh
 @@ -6,19 +6,10 @@ history_file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/history
@@ -50,4 +50,4 @@ index 1eaf0f2..ff5e790 100755
 +goto=`tac $history_file | $DMENU $COLORS | cut -d ' ' -f -3  | awk '{print $NF}'`
  
  [ -n "$goto" ] && echo "uri $goto" > $4
- #[ -n "$goto" ] && uzblctrl -s $5 -c "uri $goto"
+ #[ -n "$goto" ] && echo "uri $goto" | socat - unix-connect:$5