[Xfce4-commits] r29480 - in xfce-utils/trunk: . scripts

[Jannis Pohlmann]

Author: jannis
Date: 2009-02-11 10:58:31 +0000 (Wed, 11 Feb 2009)
New Revision: 29480

Modified:
   xfce-utils/trunk/NEWS
   xfce-utils/trunk/scripts/Makefile.am
   xfce-utils/trunk/scripts/xinitrc.in.in
Log:
Export GTK_PATH variable in xinitrc so that GTK+ has a chance to find
the Xfce theme engine even in a custom prefix (bug #4925).

Modified: xfce-utils/trunk/NEWS
===================================================================
--- xfce-utils/trunk/NEWS	2009-02-11 10:31:23 UTC (rev 29479)
+++ xfce-utils/trunk/NEWS	2009-02-11 10:58:31 UTC (rev 29480)
@@ -3,6 +3,8 @@
 
 - Fix sysconfdir and datadir not being expanded properly in 
   xinitrc (bug #4924).
+- Export GTK_PATH variable in xinitrc so that GTK+ has a chance to find
+  the Xfce theme engine even in a custom prefix (bug #4925).
 
 
 4.5.99.1 (Xfce 4.6rc1)

Modified: xfce-utils/trunk/scripts/Makefile.am
===================================================================
--- xfce-utils/trunk/scripts/Makefile.am	2009-02-11 10:31:23 UTC (rev 29479)
+++ xfce-utils/trunk/scripts/Makefile.am	2009-02-11 10:58:31 UTC (rev 29480)
@@ -13,6 +13,7 @@
 # cannot be set from configure, because ${prefix} is not expanded
 edit = sed \
 	-e "s, at _datadir_\@,$(datadir),g" \
+	-e "s, at _libdir_\@,$(libdir),g" \
 	-e "s, at _sysconfdir_\@,$(sysconfdir),g" \
 	-e "s, at BROWSER_DEFAULT\@, at BROWSER_DEFAULT@,g" \
 	-e "s, at TERMINAL_DEFAULT\@, at TERMINAL_DEFAULT@,g"

Modified: xfce-utils/trunk/scripts/xinitrc.in.in
===================================================================
--- xfce-utils/trunk/scripts/xinitrc.in.in	2009-02-11 10:31:23 UTC (rev 29479)
+++ xfce-utils/trunk/scripts/xinitrc.in.in	2009-02-11 10:58:31 UTC (rev 29480)
@@ -67,6 +67,10 @@
 export GLADE_MODULE_PATH="$GLADE_MODULE_PATH:@XFCE_GLADE_MODULE_PATH@"
 
 
+# Export GTK_PATH so that GTK+ can find the Xfce theme engine
+export GTK_PATH="$GTK_PATH:@_libdir_@/gtk-2.0"
+
+
 # For now, start with an empty list
 XRESOURCES=""