dia r4107 - in trunk: . app plug-ins/xslt

[hans svn gnome org]

Author: hans
Date: Sat Aug  9 14:39:20 2008
New Revision: 4107
URL: http://svn.gnome.org/viewvc/dia?rev=4107&view=rev

Log:
2008-08-09  Hans Breuer  <hans breuer org>

	* app/Makefile.am plug-ins/xslt/xslt.c : finally stop complaing about
	missing XSLT configuration files when running app/run_dia.sh



Modified:
   trunk/ChangeLog
   trunk/app/Makefile.am
   trunk/plug-ins/xslt/xslt.c

Modified: trunk/app/Makefile.am
==============================================================================
--- trunk/app/Makefile.am	(original)
+++ trunk/app/Makefile.am	Sat Aug  9 14:39:20 2008
@@ -269,8 +269,9 @@
 	echo DIA_INT_SHAPE_PATH=\"'$$DIA_BASE_PATH'/objects\" >> run_dia.sh
 	echo DIA_SHEET_PATH=\"'$$DIA_BASE_PATH'/sheets\" >> run_dia.sh
 	echo DIA_PYTHON_PATH=\"'$$DIA_BASE_PATH'/plug-ins/python\" >> run_dia.sh
+	echo DIA_XSLT_PATH=\"'$$DIA_BASE_PATH'/plug-ins/xslt\" >> run_dia.sh
 	echo >> run_dia.sh
-	echo "export DIA_BASE_PATH DIA_LIB_PATH DIA_SHAPE_PATH DIA_INT_SHAPE_PATH DIA_SHEET_PATH DIA_PLUGIN_PATH DIA_PYTHON_PATH" >> run_dia.sh
+	echo "export DIA_BASE_PATH DIA_LIB_PATH DIA_SHAPE_PATH DIA_INT_SHAPE_PATH DIA_SHEET_PATH DIA_PLUGIN_PATH DIA_PYTHON_PATH DIA_XSLT_PATH" >> run_dia.sh
 	echo "if [ \"x\$$DEBUGGER\" != \"x\" ] ; then " >> run_dia.sh
 	echo "  if [ ! -f \"\$$DIA_LIBS_PATH/lt-dia\" -o \"\$$DIA_LIBS_PATH/lt-dia\" -ot \"\$$DIA_LIBS_PATH/dia\" ] ; then" >> run_dia.sh
 	echo "    echo \"libtool relink stage necessary before debugging is possible.\"" >> run_dia.sh

Modified: trunk/plug-ins/xslt/xslt.c
==============================================================================
--- trunk/plug-ins/xslt/xslt.c	(original)
+++ trunk/plug-ins/xslt/xslt.c	Sat Aug  9 14:39:20 2008
@@ -338,8 +338,11 @@
 			return DIA_PLUGIN_INIT_ERROR;
 	}
 	
-	path = dia_get_data_directory("xslt" G_DIR_SEPARATOR_S
-							  "stylesheets.xml");
+	if (g_getenv ("DIA_XSLT_PATH") != NULL)
+	  path = g_build_path (G_DIR_SEPARATOR_S, g_getenv ("DIA_XSLT_PATH"), "stylesheets.xml", NULL);
+	else
+	  path = dia_get_data_directory("xslt" G_DIR_SEPARATOR_S "stylesheets.xml");
+
 	global_res = read_configuration(path);
 	g_free (path);