From 63b6c90cb3911a7424f5d30c63526a3b42ab3a5f Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Sat, 13 Nov 2010 10:44:07 -0700
Subject: replace uzbl-cookie-daemon with uzbl-cookie-manager in uzbl-browser,
 also cleanup some outdated comments in u-b

---
 Makefile         |  3 +--
 src/uzbl-browser | 29 +++++++++++++----------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index ca1401c..81df414 100644
--- a/Makefile
+++ b/Makefile
@@ -66,10 +66,9 @@ test-uzbl-browser-sandbox: uzbl-browser
 	make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser
 	make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-example-data
 	cp -np ./misc/env.sh ./sandbox/env.sh
-	source ./sandbox/env.sh && uzbl-cookie-daemon restart -nv &
+	source ./sandbox/env.sh && uzbl-cookie-manager -v &
 	source ./sandbox/env.sh && uzbl-event-manager restart -navv &
 	source ./sandbox/env.sh && uzbl-browser --uri http://www.uzbl.org --verbose
-	source ./sandbox/env.sh && uzbl-cookie-daemon stop -v
 	source ./sandbox/env.sh && uzbl-event-manager stop -ivv
 	make DESTDIR=./sandbox uninstall
 	rm -rf ./sandbox/usr
diff --git a/src/uzbl-browser b/src/uzbl-browser
index de4f7af..9f6847b 100755
--- a/src/uzbl-browser
+++ b/src/uzbl-browser
@@ -1,13 +1,11 @@
 #!/bin/sh
-# this script implements a more useful out-of-the-box "browsing experience".
-# it does so by combining uzbl-core with a set of "recommended" tools and practices.
-# see docs for more info
-# If you want to customize the behavior of the cookie-daemon or similar helper tools,
-# copy them to your $XDG_DATA_HOME/uzbl/scripts/, edit them and update $PATH
-
-# Also, we assume existence of fifo/socket == correctly functioning cookie_daemon/event_manager.
-# Checking correct functioning of the daemons here would be too complex here, and it's not implemented in uzbl-core either.
-# But this shouldn't cause much problems..
+#
+# This script implements a more useful out-of-the-box "browsing experience".
+# It does so by combining uzbl-core with a set of "recommended" tools and
+# practices. See docs for more info.
+#
+# If you want to customize the behavior any of the helper tools, copy them
+# to your $XDG_DATA_HOME/uzbl/scripts/ and edit them
 
 PREFIX=/usr/local
 if [ -z "$XDG_DATA_HOME" ]
@@ -37,6 +35,7 @@ do
 		fi
 	fi
 done
+
 # if no config exists yet in the recommended location, put the default (recommended) config there
 if [ ! -f $XDG_CONFIG_HOME/uzbl/config ]
 then
@@ -47,17 +46,15 @@ then
 	fi
 fi
 
-# Uncomment this for a slight speedup at the expense of not having
-# stale cookie daemon sockets cleaned up.
-#if [ ! -S $XDG_CACHE_HOME/uzbl/cookie_daemon_socket ]
-#then
-	# if you want to customize it, copy to your $XDG_DATA_HOME/uzbl/scripts/ and update $PATH
-	uzbl-cookie-daemon -v start
-#fi
+# uzbl-cookie-manager will exit if another instance is already running
+uzbl-cookie-manager
 
 DAEMON_SOCKET=$XDG_CACHE_HOME/uzbl/event_daemon
 DAEMON_PID=${DAEMON_SOCKET}.pid
 
+# uzbl-event-manager will exit if one is already running, but you could
+# check if the pid file exists here to avoid having to spawn it for a
+# slight speedup
 #if [ -f "$DAEMON_PID" ]
 #then
 	uzbl-event-manager -va start
-- 
cgit v1.2.3