From 8315a39fa82903b194893a3bf2f385b8f099ea02 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 6 Sep 2005 15:06:41 +0000 Subject: Fix the XDG directories correctly this time. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4742 df743ca5-7f9a-e211-a948-0013205c9059 --- ...patch-simple-editor_GMenuSimpleEditor_menutreemodel.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'x11/gnome-menus') diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py index 4a233cb4b..2306f0609 100644 --- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py +++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py @@ -1,11 +1,20 @@ ---- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig Tue Sep 6 10:53:47 2005 -+++ simple-editor/GMenuSimpleEditor/menutreemodel.py Tue Sep 6 10:56:02 2005 +--- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig Mon Apr 11 05:36:04 2005 ++++ simple-editor/GMenuSimpleEditor/menutreemodel.py Tue Sep 6 11:04:46 2005 @@ -29,7 +29,7 @@ if os.environ.has_key ("XDG_CONFIG_DIRS"): conf_dirs = os.environ["XDG_CONFIG_DIRS"] if not conf_dirs: - conf_dirs = "/etc/xdg" -+ conf_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/" ++ conf_dirs = "%%X11BASE%%/etc/xdg" for conf_dir in conf_dirs.split (":"): menu_file_path = os.path.join (conf_dir, "menus", menu_file) +@@ -51,7 +51,7 @@ + if os.environ.has_key ("XDG_DATA_DIRS"): + data_dirs = os.environ["XDG_DATA_DIRS"] + if not data_dirs: +- data_dirs = "/usr/local/share/:/usr/share/" ++ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/" + + for data_dir in data_dirs.split (":"): + retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value)) -- cgit v1.2.3