[Xfce4-commits] <xfce4-session:nick/shutdown-cleanup> Restore glade directory handling.

[Nick Schermer]

Updating branch refs/heads/nick/shutdown-cleanup
         to 20c4d7ca8a978cbb82b3940cb12fdd8059356db9 (commit)
       from 51ac5e6f8b3a463ba1dff3bd70fb0c0c88694030 (commit)

commit 20c4d7ca8a978cbb82b3940cb12fdd8059356db9
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Feb 25 11:01:33 2012 +0100

    Restore glade directory handling.

 configure.in.in       |    8 +++-----
 scripts/xinitrc.in.in |    2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index afdb33a..7abfe8b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -157,11 +157,9 @@ if test "x$linux_ioprio_works" = "xyes"; then
 fi
 
 dnl check for location Xfce glade files were installed to
-XFCE_LIBGLADE_MODULE_PATH="`pkg-config --variable libglade_module_path libxfcegui4-1.0`"
-XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalog_path libxfcegui4-1.0`"
-XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmap_path libxfcegui4-1.0`"
-XFCE_GLADE_MODULE_PATH="`pkg-config --variable glade_module_path libxfcegui4-1.0`"
-AC_SUBST(XFCE_LIBGLADE_MODULE_PATH)
+XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`"
+XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmapdir libxfce4ui-1`"
+XFCE_GLADE_MODULE_PATH="`pkg-config --variable glade_moduledir libxfce4ui-1`"
 AC_SUBST(XFCE_GLADE_CATALOG_PATH)
 AC_SUBST(XFCE_GLADE_PIXMAP_PATH)
 AC_SUBST(XFCE_GLADE_MODULE_PATH)
diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index 862f5ce..5f41a2a 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -46,11 +46,9 @@ fi
 
 # Modify libglade and glade environment variables so that
 # it will find the files installed by Xfce
-LIBGLADE_MODULE_PATH="$LIBGLADE_MODULE_PATH:@XFCE_LIBGLADE_MODULE_PATH@"
 GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@"
 GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:@XFCE_GLADE_PIXMAP_PATH@"
 GLADE_MODULE_PATH="$GLADE_MODULE_PATH:@XFCE_GLADE_MODULE_PATH@"
-export LIBGLADE_MODULE_PATH
 export GLADE_CATALOG_PATH
 export GLADE_PIXMAP_PATH
 export GLADE_MODULE_PATH