[Xfce4-commits] [xfce/xfce4-session] 01/01: Remove now useless XFCE_GLADE_*_PATH variables (Bug #13945)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-session.

commit 86a1b709facaec527dacdd0b4421b9a25128b2d2
Author: Romain B <skunnyk at alteroot.org>
Date:   Wed Jan 3 18:04:36 2018 +0100

    Remove now useless XFCE_GLADE_*_PATH variables (Bug #13945)
    
    - No need to export theses useless variables, and they are not used by glade gtk3 anymore: https://mail.gnome.org/archives/gtk-devel-list/2011-October/msg00031.html
    - This fix bug #13945
    - libxfce4ui needs to remove theses variables from .pc too
---
 configure.ac.in       | 8 --------
 scripts/xinitrc.in.in | 9 ---------
 2 files changed, 17 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index cfdb87b..84a57b2 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -201,14 +201,6 @@ if test x$with_backend = xopenbsd; then
     AC_DEFINE(BACKEND_TYPE_OPENBSD, 1, [OpenBSD suspend/hibernate backend])
 fi
 
-dnl check for location Xfce glade files were installed to
-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)
-
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index 01a5dcc..8aea66c 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -50,15 +50,6 @@ if which xdg-user-dirs-update >/dev/null 2>&1; then
     xdg-user-dirs-update
 fi
 
-# Modify libglade and glade environment variables so that
-# it will find the files installed by Xfce
-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 GLADE_CATALOG_PATH
-export GLADE_PIXMAP_PATH
-export GLADE_MODULE_PATH
-
 # For now, start with an empty list
 XRESOURCES=""
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.