From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 23 Jan 2015 18:23:43 +0000 (+0100)
Subject: Ensure that example_dir is relocatable.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=9b672d123972070af16b70b9b82054c317522e9b

Ensure that example_dir is relocatable.

commit be1157c5591142920a95d587acf97f5eaf3d04fe added a reference to the
installed data directory.  Unfortunately I forgot to allow for relocatable
installations.  This change fixes that.
---

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index e7dd0315f3..c233eaa65d 100644
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -15,6 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+#include <gl/relocatable.h>
 
 #include "psppire-window.h"
 #include "psppire-window-base.h"
@@ -766,7 +767,7 @@ psppire_window_open (PsppireWindow *de)
 {
   GtkWidget *dialog = psppire_window_file_chooser_dialog (de);
 
-  gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), examples_dir, NULL);
+  gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), relocate (examples_dir), NULL);
 
   switch (gtk_dialog_run (GTK_DIALOG (dialog)))
     {