[meld] Enable Mallard-based help from within Meld

[Kai Willadsen <kaiw src gnome org>]

commit 4d84c2578b99d9e2ccf07d25363fedfc5c623912
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Sep 6 17:21:55 2013 +1000

    Enable Mallard-based help from within Meld

 help/C/{ => meld}/command-line.page          |    0
 help/C/{ => meld}/file-changes.page          |    0
 help/C/{ => meld}/file-filters.page          |    0
 help/C/{ => meld}/file-mode.page             |    0
 help/C/{ => meld}/flattened-view.page        |    0
 help/C/{ => meld}/folder-mode.page           |    0
 help/C/{ => meld}/index.page                 |    0
 help/C/{ => meld}/introduction.page          |    0
 help/C/{ => meld}/keyboard-shortcuts.page    |    0
 help/C/{ => meld}/legal.xml                  |    0
 help/C/{ => meld}/missing-functionality.page |    0
 help/C/{ => meld}/preferences.page           |    0
 help/C/{ => meld}/resolving-conflicts.page   |    0
 help/C/{ => meld}/text-filters.page          |    0
 help/C/{ => meld}/vc-mode.page               |    0
 help/C/{ => meld}/vc-supported.page          |    0
 meld/conf.py                                 |    6 ++++++
 meld/meldwindow.py                           |    3 +--
 18 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/help/C/command-line.page b/help/C/meld/command-line.page
similarity index 100%
rename from help/C/command-line.page
rename to help/C/meld/command-line.page
diff --git a/help/C/file-changes.page b/help/C/meld/file-changes.page
similarity index 100%
rename from help/C/file-changes.page
rename to help/C/meld/file-changes.page
diff --git a/help/C/file-filters.page b/help/C/meld/file-filters.page
similarity index 100%
rename from help/C/file-filters.page
rename to help/C/meld/file-filters.page
diff --git a/help/C/file-mode.page b/help/C/meld/file-mode.page
similarity index 100%
rename from help/C/file-mode.page
rename to help/C/meld/file-mode.page
diff --git a/help/C/flattened-view.page b/help/C/meld/flattened-view.page
similarity index 100%
rename from help/C/flattened-view.page
rename to help/C/meld/flattened-view.page
diff --git a/help/C/folder-mode.page b/help/C/meld/folder-mode.page
similarity index 100%
rename from help/C/folder-mode.page
rename to help/C/meld/folder-mode.page
diff --git a/help/C/index.page b/help/C/meld/index.page
similarity index 100%
rename from help/C/index.page
rename to help/C/meld/index.page
diff --git a/help/C/introduction.page b/help/C/meld/introduction.page
similarity index 100%
rename from help/C/introduction.page
rename to help/C/meld/introduction.page
diff --git a/help/C/keyboard-shortcuts.page b/help/C/meld/keyboard-shortcuts.page
similarity index 100%
rename from help/C/keyboard-shortcuts.page
rename to help/C/meld/keyboard-shortcuts.page
diff --git a/help/C/legal.xml b/help/C/meld/legal.xml
similarity index 100%
rename from help/C/legal.xml
rename to help/C/meld/legal.xml
diff --git a/help/C/missing-functionality.page b/help/C/meld/missing-functionality.page
similarity index 100%
rename from help/C/missing-functionality.page
rename to help/C/meld/missing-functionality.page
diff --git a/help/C/preferences.page b/help/C/meld/preferences.page
similarity index 100%
rename from help/C/preferences.page
rename to help/C/meld/preferences.page
diff --git a/help/C/resolving-conflicts.page b/help/C/meld/resolving-conflicts.page
similarity index 100%
rename from help/C/resolving-conflicts.page
rename to help/C/meld/resolving-conflicts.page
diff --git a/help/C/text-filters.page b/help/C/meld/text-filters.page
similarity index 100%
rename from help/C/text-filters.page
rename to help/C/meld/text-filters.page
diff --git a/help/C/vc-mode.page b/help/C/meld/vc-mode.page
similarity index 100%
rename from help/C/vc-mode.page
rename to help/C/meld/vc-mode.page
diff --git a/help/C/vc-supported.page b/help/C/meld/vc-supported.page
similarity index 100%
rename from help/C/vc-supported.page
rename to help/C/meld/vc-supported.page
diff --git a/meld/conf.py b/meld/conf.py
index fd9a5d6..68edcfe 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -15,3 +15,9 @@ def uninstalled():
 
     DATADIR = DATADIR or os.path.join(melddir, "data")
     LOCALEDIR = LOCALEDIR or os.path.join(melddir, "build", "mo")
+
+    # This first bit should be unnecessary, but some things (GTK icon theme
+    # location, GSettings schema location) don't fall back correctly.
+    data_dir = os.environ.get('XDG_DATA_DIRS', "/usr/local/share/:/usr/share/")
+    data_dir = ":".join((melddir, data_dir))
+    os.environ['XDG_DATA_DIRS'] = data_dir
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index af0106f..427b786 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -531,8 +531,7 @@ class MeldWindow(gnomeglade.Component):
         app.prefs.statusbar_visible = widget.get_active()
 
     def on_menu_help_activate(self, button):
-        help_path = "/".join(["help", "meld"])
-        misc.open_uri(help_path)
+        misc.open_uri("help:meld")
 
     def on_menu_help_bug_activate(self, button):
         misc.open_uri("http://bugzilla.gnome.org/buglist.cgi?query=product%3Ameld";)