From df5a4e6d71dd65ea2273e29f79c8cb194b197b67 Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Mon, 30 Nov 2009 16:10:07 +0000 Subject: [PATCH] pandora-xfce-defaults: Move Xfce defaults to an archive rather than seperate files. Easier to manage and install. Also update the archive with the latest templates. --- recipes/branding/pandora-xfce-defaults.bb | 18 +- .../pandora-xfce-defaults/xfce4-conf.zip | Bin 0 -> 6939 bytes .../xfce4-panel/actions-12.rc | 3 - .../xfce4-panel/clock-14.rc | 10 - .../xfce4-panel/launcher-10.rc | 12 - .../xfce4-panel/launcher-10.rc.bak | 12 - .../xfce4-panel/launcher-12589452264.rc | 11 - .../xfce4-panel/launcher-12589456725.rc | 11 - .../xfce4-panel/launcher-12589456725.rc.bak | 11 - .../xfce4-panel/launcher-8.rc | 12 - .../xfce4-panel/launcher-8.rc.bak | 12 - .../xfce4-panel/launcher-9.rc | 12 - .../xfce4-panel/pager-2.rc | 4 - .../xfce4-panel/panels.xml | 35 --- .../xfce4-panel/panels.xml.bak | 35 --- .../xfce4-panel/separator-11.rc | 2 - .../xfce4-panel/separator-13.rc | 2 - .../xfce4-panel/separator-6.rc | 2 - .../xfce4-panel/systray-4.rc | 12 - .../xfce4-panel/systray-4.rc.bak | 12 - .../xfce4-panel/windowlist-12589448981.rc | 6 - .../xfce4-panel/xfce4-menu-5.rc | 7 - .../xfce4-panel/xfce4-menu-5.rc.bak | 6 - .../pandora-xfce-defaults/xfce4/Xft.xrdb | 7 - .../pandora-xfce-defaults/xfce4/helpers.rc | 3 - .../pandora-xfce-defaults/xfce4/mount.rc | 54 ----- .../pandora-xfce-defaults/xfce4/xinitrc | 229 ------------------ .../xfce4-desktop.xml | 23 -- .../xfce4-keyboard-shortcuts.xml | 130 ---------- .../xfce4-mixer.xml | 7 - .../xfce4-notifyd.xml | 8 - .../xfce4-session.xml | 31 --- .../xfce4-settings-manager.xml | 6 - .../xfconf-xfce-perchannel-xml/xfprint.xml | 5 - .../xfconf-xfce-perchannel-xml/xfwm4.xml | 76 ------ .../xfconf-xfce-perchannel-xml/xsettings.xml | 16 -- 36 files changed, 6 insertions(+), 836 deletions(-) create mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-conf.zip delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/actions-12.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/clock-14.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc.bak delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589452264.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc.bak delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc.bak delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-9.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/pager-2.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml.bak delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-11.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-13.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-6.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc.bak delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/windowlist-12589448981.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc.bak delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4/Xft.xrdb delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4/helpers.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4/mount.rc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfce4/xinitrc delete mode 100644 recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-desktop.xml delete mode 100644 recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml delete mode 100644 recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-mixer.xml delete mode 100644 recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-notifyd.xml delete mode 100644 recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-session.xml delete mode 100644 recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-settings-manager.xml delete mode 100644 recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfprint.xml delete mode 100644 recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfwm4.xml delete mode 100644 recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xsettings.xml diff --git a/recipes/branding/pandora-xfce-defaults.bb b/recipes/branding/pandora-xfce-defaults.bb index 63d4427..62dc17a 100644 --- a/recipes/branding/pandora-xfce-defaults.bb +++ b/recipes/branding/pandora-xfce-defaults.bb @@ -2,16 +2,11 @@ DESCRIPTION = "Default OpenPandora settings for Xfce4" HOMEPAGE = "http://www.openpandora.org" SECTION = "x11/xfce" -PR = "r3" +PR = "r4" SRC_URI = " \ + file://xfce4-conf.zip \ file://pixmaps/* \ - \ - file://xfce4/* \ - \ - file://xfce4-panel/* \ - \ - file://xfconf-xfce-perchannel-xml/* \ " do_install() { @@ -19,13 +14,12 @@ do_install() { install -m 0644 ${WORKDIR}/pixmaps/* ${D}${datadir}/pixmaps/ install -d ${D}${sysconfdir}/xdg/op/xfce4/ - install -m 0644 ${WORKDIR}/xfce4/* ${D}${sysconfdir}/xdg/op/xfce4/ install -d ${D}${sysconfdir}/xdg/op/xfce4/panel/ - install -m 0644 ${WORKDIR}/xfce4-panel/* ${D}${sysconfdir}/xdg/op/xfce4/panel/ - - install -d ${D}${sysconfdir}/xdg/op/xfconf/xfce-perchannel-xml/ - install -m 0644 ${WORKDIR}/xfconf-xfce-perchannel-xml/* ${D}${sysconfdir}/xdg/op/xfconf/xfce-perchannel-xml/ + install -m 0666 ${WORKDIR}/xfce4/panel/* ${D}${sysconfdir}/xdg/op/xfce4/panel/ + + install -d ${D}${sysconfdir}/xdg/op/xfce4/xfconf/xfce-perchannel-xml/ + install -m 0666 ${WORKDIR}/xfce4/xfconf/xfce-perchannel-xml/* ${D}${sysconfdir}/xdg/op/xfce4/xfconf/xfce-perchannel-xml/ } PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-conf.zip b/recipes/branding/pandora-xfce-defaults/xfce4-conf.zip new file mode 100644 index 0000000000000000000000000000000000000000..a035afbcdc6b36203d10b12408186db89f551d8c GIT binary patch literal 6939 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 CO>iXu literal 0 HcmV?d00001 diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/actions-12.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/actions-12.rc deleted file mode 100644 index cef4af6..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/actions-12.rc +++ /dev/null @@ -1,3 +0,0 @@ -type=0 -orientation=0 - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/clock-14.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/clock-14.rc deleted file mode 100644 index 687a9ad..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/clock-14.rc +++ /dev/null @@ -1,10 +0,0 @@ -DigitalFormat=%R -TooltipFormat=%A %d %B %Y -ClockType=2 -ShowFrame=false -ShowSeconds=true -ShowMilitary=true -ShowMeridiem=false -TrueBinary=false -FlashSeparators=false - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc deleted file mode 100644 index f04815c..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc +++ /dev/null @@ -1,12 +0,0 @@ -[Global] -MoveFirst=false -ArrowPosition=0 - -[Entry 0] -Name=Web Browser -Comment=Surf the internet -Icon=internet-web-browser -Exec=exo-open --launch WebBrowser -Terminal=false -StartupNotify=false - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc.bak deleted file mode 100644 index e3dd358..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc.bak +++ /dev/null @@ -1,12 +0,0 @@ -[Entry 0] -Name=Web Browser -Comment=Surf the internet -Icon=internet-web-browser -Exec=exo-open --launch WebBrowser -Terminal=false -StartupNotify=false - -[Global] -MoveFirst=false -ArrowPosition=0 - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589452264.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589452264.rc deleted file mode 100644 index 1e59efe..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589452264.rc +++ /dev/null @@ -1,11 +0,0 @@ -[Global] -MoveFirst=false -ArrowPosition=0 - -[Entry 0] -Name=eMail -Icon=internet-mail -Exec=exo-open --launch MailReader -Terminal=false -StartupNotify=false - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc deleted file mode 100644 index 73982b1..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc +++ /dev/null @@ -1,11 +0,0 @@ -[Global] -MoveFirst=false -ArrowPosition=0 - -[Entry 0] -Name=Messenger -Icon=internet-group-chat -Exec='/usr/bin/pidgin' -Terminal=false -StartupNotify=false - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc.bak deleted file mode 100644 index c8098e9..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc.bak +++ /dev/null @@ -1,11 +0,0 @@ -[Entry 0] -Name=Messenger -Icon=internet-group-chat -Exec='/usr/bin/pidgin' -Terminal=false -StartupNotify=false - -[Global] -MoveFirst=false -ArrowPosition=0 - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc deleted file mode 100644 index 87d44c0..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc +++ /dev/null @@ -1,12 +0,0 @@ -[Global] -MoveFirst=false -ArrowPosition=0 - -[Entry 0] -Name=Editor -Comment=Edit text files -Icon=accessories-text-editor -Exec=mousepad -Terminal=false -StartupNotify=true - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc.bak deleted file mode 100644 index db35d4b..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc.bak +++ /dev/null @@ -1,12 +0,0 @@ -[Entry 0] -Name=Editor -Comment=Edit text files -Icon=accessories-text-editor -Exec=mousepad -Terminal=false -StartupNotify=true - -[Global] -MoveFirst=false -ArrowPosition=0 - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-9.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-9.rc deleted file mode 100644 index cd21114..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-9.rc +++ /dev/null @@ -1,12 +0,0 @@ -[Global] -MoveFirst=false -ArrowPosition=0 - -[Entry 0] -Name=File Manager -Comment=Manage files and folders -Icon=xfce-filemanager -Exec=thunar -Terminal=false -StartupNotify=true - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/pager-2.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/pager-2.rc deleted file mode 100644 index cb0d5e9..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/pager-2.rc +++ /dev/null @@ -1,4 +0,0 @@ -rows=2 -scrolling=true -show-names=false - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml b/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml deleted file mode 100644 index 71b4d94..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml.bak deleted file mode 100644 index f926eac..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml.bak +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-11.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-11.rc deleted file mode 100644 index c46dd6a..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-11.rc +++ /dev/null @@ -1,2 +0,0 @@ -separator-type=2 - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-13.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-13.rc deleted file mode 100644 index ea80172..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-13.rc +++ /dev/null @@ -1,2 +0,0 @@ -separator-type=1 - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-6.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-6.rc deleted file mode 100644 index c46dd6a..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-6.rc +++ /dev/null @@ -1,2 +0,0 @@ -separator-type=2 - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc deleted file mode 100644 index cf6433a..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc +++ /dev/null @@ -1,12 +0,0 @@ -[Global] -ShowFrame=false -Rows=1 - -[Applications] -bluetooth applet=false -gigolo=false -gnome-mplayer=false -networkmanager applet=false -orage=false -pidgin=false - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc.bak deleted file mode 100644 index 9c14a43..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc.bak +++ /dev/null @@ -1,12 +0,0 @@ -[Global] -ShowFrame=false -Rows=1 - -[Applications] -networkmanager applet=false -orage=false -gigolo=false -gnome-mplayer=false -bluetooth applet=false -pidgin=false - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/windowlist-12589448981.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/windowlist-12589448981.rc deleted file mode 100644 index 3dad081..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/windowlist-12589448981.rc +++ /dev/null @@ -1,6 +0,0 @@ -button_layout=0 -urgency_notify=1 -show_all_workspaces=true -show_window_icons=false -show_workspace_actions=false - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc b/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc deleted file mode 100644 index ccdd8fb..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc +++ /dev/null @@ -1,7 +0,0 @@ -use_default_menu=true -menu_file= -icon_file=/usr/share/pixmaps/op-start.png -show_menu_icons=true -button_title=OpenPandora Menu -show_button_title=false - diff --git a/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc.bak b/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc.bak deleted file mode 100644 index c99de3c..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc.bak +++ /dev/null @@ -1,6 +0,0 @@ -use_default_menu=true -menu_file= -icon_file=/usr/share/pixmaps/op-start.png -show_menu_icons=true -button_title=OpenPandora Menu -show_button_title=false diff --git a/recipes/branding/pandora-xfce-defaults/xfce4/Xft.xrdb b/recipes/branding/pandora-xfce-defaults/xfce4/Xft.xrdb deleted file mode 100644 index af45361..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4/Xft.xrdb +++ /dev/null @@ -1,7 +0,0 @@ -# Those are fallback settings, use the ui plugin to change it -# or add your overrides to ~/.Xresources -# Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull -# Xft hinting: 1/0 - -Xft.hinting: 1 -Xft.hintstyle: hintmedium diff --git a/recipes/branding/pandora-xfce-defaults/xfce4/helpers.rc b/recipes/branding/pandora-xfce-defaults/xfce4/helpers.rc deleted file mode 100644 index c6fd4ed..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4/helpers.rc +++ /dev/null @@ -1,3 +0,0 @@ -WebBrowser=midori -MailReader=sylpheed-claws -TerminalEmulator=Terminal diff --git a/recipes/branding/pandora-xfce-defaults/xfce4/mount.rc b/recipes/branding/pandora-xfce-defaults/xfce4/mount.rc deleted file mode 100644 index 723b841..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4/mount.rc +++ /dev/null @@ -1,54 +0,0 @@ -# -# ABOUT -# ===== -# This file contains the mount option configuration when exo-mount is used with the HAL -# back end (which is highly recommended). If mounting using exo is somehow not working -# for you, you can copy this file to your $XDG_CONFIG_HOME/xfce4 directory and modify it. -# -# The options for each filesystem are not used when they are not in the list of -# valid mount options provided by HAL. You can find those values using lshal and -# search for the volume.mount.valid_options property. -# -# -# EXAMPLE -# ======= -# For example your usb device contains the vfat file system and lshal shows the -# following valid mount options for the device: -# -# volume.mount.valid_options = {'ro', 'sync', 'dirsync', 'noatime', 'nodiratime', -# 'noexec', 'quiet', 'remount', 'exec', 'uid=', -# 'gid=', 'umask=', 'utf8'} (string list) -# -# All the values that end with a = character are options that contain a value, -# the other options are booleans that can be enabled by for example putting -# utf8=true in the group. -# -# -# SUBSTITUTIONS -# ============= -# Some options can be substituted by exo-mount when you set the value to : -# uid : The real user ID -# gid : The real group ID -# iocharset: To the EXO_MOUNT_IOCHARSET or LC_CTYPE environment variable. -# - -[vfat] -uid= -shortname=winnt -# FreeBSD specific option -longnames=true - -[iso9660] -uid= - -[udf] -uid= -iocharset= - -[ntfs] -uid= - -[ntfs-3g] -uid= -# Make sure the device does not get 0777 permissions -umask=0077 diff --git a/recipes/branding/pandora-xfce-defaults/xfce4/xinitrc b/recipes/branding/pandora-xfce-defaults/xfce4/xinitrc deleted file mode 100644 index f46fbb2..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfce4/xinitrc +++ /dev/null @@ -1,229 +0,0 @@ -#!/bin/sh - -# fix broken $UID on some system... -if test "x$UID" = "x"; then - if test -x /usr/xpg4/bin/id; then - UID=`/usr/xpg4/bin/id -u`; - else - UID=`id -u`; - fi -fi - -# $XDG_CONFIG_HOME defines the base directory relative to which user specific -# configuration files should be stored. If $XDG_CONFIG_HOME is either not set -# or empty, a default equal to $HOME/.config should be used. -if test "x$XDG_CONFIG_HOME" = "x" ; then - XDG_CONFIG_HOME=$HOME/.config -fi -[ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME" - -# $XDG_CACHE_HOME defines the base directory relative to which user specific -# non-essential data files should be stored. If $XDG_CACHE_HOME is either not -# set or empty, a default equal to $HOME/.cache should be used. -if test "x$XDG_CACHE_HOME" = "x" ; then - XDG_CACHE_HOME=$HOME/.cache -fi -[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" - - -# set up XDG user directores. see -# http://freedesktop.org/wiki/Software/xdg-user-dirs -if type xdg-user-dirs-update >/dev/null 2>&1; then - xdg-user-dirs-update -fi - -if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then - . "$XDG_CONFIG_HOME/user-dirs.dirs" - # i'm deliberately not 'export'-ing the XDG_ vars, because you shouldn't - # rely on the env vars inside apps, since the file could be changed at - # any time by the user. this is solely here for migration purposes. - - # a bit of user dir migration... - if test -d "$HOME/Desktop" -a ! -L "$HOME/Desktop" \ - -a "$XDG_DESKTOP_DIR" \ - -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR" - then - echo "Migrating $HOME/Desktop to $XDG_DESKTOP_DIR..." - test -d "$XDG_DESKTOP_DIR" && rmdir "$XDG_DESKTOP_DIR" - mv "$HOME/Desktop" "$XDG_DESKTOP_DIR" || echo "Desktop migration failed" >&2 - fi - - if test -d "$HOME/Templates" -a ! -L "$HOME/Templates" \ - -a "$XDG_TEMPLATES_DIR" \ - -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR" - then - echo "Migrating $HOME/Templates to $XDG_TEMPLATES_DIR..." - test -d "$XDG_TEMPLATES_DIR" && rmdir "$XDG_TEMPLATES_DIR" - mv "$HOME/Templates" "$XDG_TEMPLATES_DIR" || echo "Templates migration failed" >&2 - fi -fi - - -# Modify libglade and glade environment variables so that -# it will find the files installed by Xfce -export LIBGLADE_MODULE_PATH="$LIBGLADE_MODULE_PATH:/usr/lib/libglade/2.0" -export GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:" -export GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:" -export GLADE_MODULE_PATH="$GLADE_MODULE_PATH:" - - -# Export GTK_PATH so that GTK+ can find the Xfce theme engine -export GTK_PATH="$GTK_PATH:/usr/lib/gtk-2.0" - - -# For now, start with an empty list -XRESOURCES="" - -# Has to go prior to merging Xft.xrdb, as its the "Defaults" file -test -r "/etc/xdg/xfce4/Xft.xrdb" && XRESOURCES="$XRESOURCES /etc/xdg/xfce4/Xft.xrdb" -test -r $HOME/.Xdefaults && XRESOURCES="$XRESOURCES $HOME/.Xdefaults" - -BASEDIR=$XDG_CONFIG_HOME/xfce4 -if test -r "$BASEDIR/Xft.xrdb"; then - XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb" -elif test -r "$XFCE4HOME/Xft.xrdb"; then - mkdir -p "$BASEDIR" - cp "$XFCE4HOME/Xft.xrdb" "$BASEDIR"/ - XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb" -fi - -# merge in X cursor settings -test -r "$BASEDIR/Xcursor.xrdb" && XRESOURCES="$XRESOURCES $BASEDIR/Xcursor.xrdb" - -# ~/.Xresources contains overrides to the above -test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources" - -# load all X resources (adds /dev/null to avoid an empty list that would hang the process) -cat /dev/null $XRESOURCES | xrdb -nocpp -merge - - -# load local modmap -test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap - -# Launch xscreensaver (if available), but only as non-root user -if test $UID -gt 0 -a -z "$VNCSESSION"; then - if test x"`which xscreensaver 2>/dev/null`" != x""; then - xscreensaver -no-splash & - elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then - gnome-screensaver & - fi -fi - -# Use ssh-agent if installed and not already running. Run it separately -# so it populates the environment here, so we can clean it up later. -sshagent=`which ssh-agent` -kill_sshagent=0 -if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then - eval `$sshagent -s` - kill_sshagent=1 -fi - -# Use dbus-launch if installed. -if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then - dbuslaunch=`which dbus-launch` - if test x"$dbuslaunch" != x"" -a x"$dbuslaunch" != x"no"; then - eval `$dbuslaunch --sh-syntax --exit-with-session` - fi -fi - -# Run xfce4-session if installed -xfcesm=`which xfce4-session` -case "x$xfcesm" in - x|xno*) - ;; - *) - $xfcesm - - if test $kill_sshagent -eq 1; then - eval `$sshagent -k` - fi - exit 0 - ;; -esac - - -################## -# IMPORTANT NOTE # -################## - -# Everything below here ONLY gets executed if you are NOT using xfce4-session -# (Xfce's session manager). If you are using the session manager, everything -# below is handled by it, and the code below is not executed at all. If you're -# not sure if you're using the session manager, type 'ps -e|grep xfce4-session' -# in a terminal while Xfce is running. - -################## - - -# this is only necessary when running w/o xfce4-session -xsetroot -solid black -cursor_name watch - -# or use old-fashioned startup script otherwise - -xfsettingsd & -xfwm4 --daemon - -# start up stuff in $XDG_CONFIG_HOME/autostart/, as that looks to be -# the new standard. if that directory doesn't exist, try the old -# ~/Desktop/Autostart method. we're not going to do any migration here. -if test -d "$XDG_CONFIG_HOME/autostart"; then - for i in ${XDG_CONFIG_HOME}/autostart/*.desktop; do - grep -q -E "^Hidden=true" "$i" && continue - if grep -q -E "^OnlyShowIn=" "$i"; then - # need to test twice, as lack of the line entirely means we still run it - grep -E "^OnlyShowIn=" "$i" | grep -q 'XFCE;' || continue - fi - grep -E "^NotShowIn=" "$i" | grep -q 'XFCE;' && continue - - # check for TryExec - trycmd=`grep -E "^TryExec=" "$i" | cut -d'=' -f2` - if test "$trycmd"; then - type "$trycmd" >/dev/null 2>&1 || continue - fi - - cmd=`grep -E "^Exec=" "$i" | cut -d'=' -f2` - if test "$cmd" && type "$cmd" >/dev/null 2>&1; then - $cmd & - fi - done -elif test -d "$HOME/Desktop/Autostart"; then - for i in `ls -1 -L ${HOME}/Desktop/Autostart/ 2>/dev/null`; do - if test -x $HOME/Desktop/Autostart/$i; then - $HOME/Desktop/Autostart/$i & - fi - done -fi - -xfdesktop& -orage & - -panel=`which xfce4-panel` -case "x$panel" in - x|xno*) - ;; - *) - $panel - ret=$? - while test $ret -ne 0; do - xmessage -center -file - -timeout 20 -title Error <&2 < - - - - - - - - - - - - - - - - - - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml deleted file mode 100644 index c9e743e..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-mixer.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-mixer.xml deleted file mode 100644 index 54edd93..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-mixer.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-notifyd.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-notifyd.xml deleted file mode 100644 index cee2f4d..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-notifyd.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-session.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-session.xml deleted file mode 100644 index 938d232..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-session.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-settings-manager.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-settings-manager.xml deleted file mode 100644 index 691d3cd..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-settings-manager.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfprint.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfprint.xml deleted file mode 100644 index 4dce890..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfprint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfwm4.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfwm4.xml deleted file mode 100644 index 449e050..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfwm4.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xsettings.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xsettings.xml deleted file mode 100644 index 7f54904..0000000 --- a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xsettings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - -- 2.39.5