From d55f6c7e55a94161924e1380dd70ef72624cecd7 Mon Sep 17 00:00:00 2001 From: Mason Larobina Date: Fri, 1 Jan 2010 13:09:36 +0800 Subject: Moved xdghome function out of config section. --- examples/data/uzbl/scripts/uzbl-event-manager | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'examples') diff --git a/examples/data/uzbl/scripts/uzbl-event-manager b/examples/data/uzbl/scripts/uzbl-event-manager index 916259a..a3148a2 100755 --- a/examples/data/uzbl/scripts/uzbl-event-manager +++ b/examples/data/uzbl/scripts/uzbl-event-manager @@ -41,13 +41,6 @@ from traceback import print_exc from functools import partial -# ============================================================================ -# ::: Default configuration section :::::::::::::::::::::::::::::::::::::::::: -# ============================================================================ - -# `make install` will put the correct value here for your system -PREFIX = '/usr/local/' - def xdghome(key, default): '''Attempts to use the environ XDG_*_HOME paths if they exist otherwise use $HOME and the default path.''' @@ -58,11 +51,18 @@ def xdghome(key, default): return os.path.join(os.environ['HOME'], default) + +# ============================================================================ +# ::: Default configuration section :::::::::::::::::::::::::::::::::::::::::: +# ============================================================================ + +# `make install` will put the correct value here for your system +PREFIX = '/usr/local/' + # Setup xdg paths. DATA_DIR = os.path.join(xdghome('DATA', '.local/share/'), 'uzbl/') CACHE_DIR = os.path.join(xdghome('CACHE', '.cache/'), 'uzbl/') - # Event manager config dictionary. This is not to be confused with the config # dict that tracks variables in the uzbl instance. CONFIG = { @@ -80,7 +80,6 @@ CONFIG = { 'pid_file': os.path.join(CACHE_DIR, 'event_daemon.pid'), } - # ============================================================================ # ::: End of configuration section ::::::::::::::::::::::::::::::::::::::::::: # ============================================================================ -- cgit v1.2.3