summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-06 23:06:41 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-06 23:06:41 +0800
commit8315a39fa82903b194893a3bf2f385b8f099ea02 (patch)
tree4346e8aa61d3483fbe9872ec3f2a902457ea49f0
parentb16e3072d2b010ae603c852db64ccc2b52e11fc3 (diff)
downloadmarcuscom-ports-8315a39fa82903b194893a3bf2f385b8f099ea02.tar
marcuscom-ports-8315a39fa82903b194893a3bf2f385b8f099ea02.tar.gz
marcuscom-ports-8315a39fa82903b194893a3bf2f385b8f099ea02.tar.bz2
marcuscom-ports-8315a39fa82903b194893a3bf2f385b8f099ea02.tar.lz
marcuscom-ports-8315a39fa82903b194893a3bf2f385b8f099ea02.tar.xz
marcuscom-ports-8315a39fa82903b194893a3bf2f385b8f099ea02.tar.zst
marcuscom-ports-8315a39fa82903b194893a3bf2f385b8f099ea02.zip
Fix the XDG directories correctly this time.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4742 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py15
1 files changed, 12 insertions, 3 deletions
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))