← Back to branch summary

~ubuntu-branches/ubuntu/vivid/xfce4-session/vivid-proposed

« back to all changes in this revision

Viewing changes to scripts/xinitrc.in

  • Committer: Package Import Robot
  • Author(s): Sean Davis
  • Date: 2014-12-01 21:12:28 UTC
  • mfrom: (1.4.6) (4.1.9 experimental)
  • Revision ID: package-import@ubuntu.com-20141201211228-bqdgmiclbn2e9823
Tags: 4.11.1-0ubuntu1
* New upstream release.
* debian/patches:
  - Dropped 02_runtime-logind-support.patch and
    xubuntu_set-xdg-current-desktop.patch, included upstream.
  - Refreshed 01_fix-xrdb-call.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/xinitrc.in
22
22
  export DESKTOP_SESSION
23
23
fi
24
24
 
25
 
# set XDG_CURRENT_DESKTOP for alacarte
 
25
# set XDG_CURRENT_DESKTOP so that Qt 5 applications can identify user set Xfce theme
26
26
if test "x$XDG_CURRENT_DESKTOP" = "x"; then
27
27
  XDG_CURRENT_DESKTOP="XFCE"
28
28
  export XDG_CURRENT_DESKTOP
52
52
 
53
53
# Modify libglade and glade environment variables so that
54
54
# it will find the files installed by Xfce
55
 
GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:/usr/share/glade3/catalogs"
56
 
GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:/usr/lib/glade3/modules"
57
 
GLADE_MODULE_PATH="$GLADE_MODULE_PATH:/usr/share/glade3/pixmaps"
 
55
GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:"
 
56
GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:"
 
57
GLADE_MODULE_PATH="$GLADE_MODULE_PATH:"
58
58
export GLADE_CATALOG_PATH
59
59
export GLADE_PIXMAP_PATH
60
60
export GLADE_MODULE_PATH