$OpenBSD: patch-base_utils_py,v 1.3 2010/11/05 08:21:22 ajacoutot Exp $ --- base/utils.py.orig Sun Sep 26 19:07:36 2010 +++ base/utils.py Fri Nov 5 09:14:19 2010 @@ -497,7 +497,7 @@ class UserSettings(object): # Note: Deprecated after 2 if len(path): self.cmd_pcard = 'hp-unload -d %DEVICE_URI%' else: - self.cmd_pcard = 'python %HOME%/unload.py -d %DEVICE_URI%' + self.cmd_pcard = '${MODPY_BIN} %HOME%/unload.py -d %DEVICE_URI%' # Copy path = which('hp-makecopies') @@ -505,7 +505,7 @@ class UserSettings(object): # Note: Deprecated after 2 if len(path): self.cmd_copy = 'hp-makecopies -d %DEVICE_URI%' else: - self.cmd_copy = 'python %HOME%/makecopies.py -d %DEVICE_URI%' + self.cmd_copy = '${MODPY_BIN} %HOME%/makecopies.py -d %DEVICE_URI%' # Fax path = which('hp-sendfax') @@ -513,7 +513,7 @@ class UserSettings(object): # Note: Deprecated after 2 if len(path): self.cmd_fax = 'hp-sendfax -d %FAX_URI%' else: - self.cmd_fax = 'python %HOME%/sendfax.py -d %FAX_URI%' + self.cmd_fax = '${MODPY_BIN} %HOME%/sendfax.py -d %FAX_URI%' # Fax Address Book path = which('hp-fab') @@ -521,7 +521,7 @@ class UserSettings(object): # Note: Deprecated after 2 if len(path): self.cmd_fab = 'hp-fab' else: - self.cmd_fab = 'python %HOME%/fab.py' + self.cmd_fab = '${MODPY_BIN} %HOME%/fab.py' def load(self): self.loadDefaults() @@ -840,8 +840,8 @@ def all(S,f=lambda x:x): return True -BROWSERS = ['firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order -BROWSER_OPTS = {'firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''} +BROWSERS = ['xdg-open'] +BROWSER_OPTS = {'xdg-open' : ''} def find_browser():