pandora-xfce-defaults: Move Xfce defaults to an archive rather than seperate files...
authorDavid-John Willis <John.Willis@Distant-earth.com>
Mon, 30 Nov 2009 16:10:07 +0000 (16:10 +0000)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Mon, 30 Nov 2009 16:10:07 +0000 (16:10 +0000)
36 files changed:
recipes/branding/pandora-xfce-defaults.bb
recipes/branding/pandora-xfce-defaults/xfce4-conf.zip [new file with mode: 0644]
recipes/branding/pandora-xfce-defaults/xfce4-panel/actions-12.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/clock-14.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-10.rc.bak [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589452264.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-12589456725.rc.bak [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-8.rc.bak [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/launcher-9.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/pager-2.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/panels.xml.bak [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-11.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-13.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/separator-6.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/systray-4.rc.bak [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/windowlist-12589448981.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4-panel/xfce4-menu-5.rc.bak [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4/Xft.xrdb [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4/helpers.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4/mount.rc [deleted file]
recipes/branding/pandora-xfce-defaults/xfce4/xinitrc [deleted file]
recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-desktop.xml [deleted file]
recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml [deleted file]
recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-mixer.xml [deleted file]
recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-notifyd.xml [deleted file]
recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-session.xml [deleted file]
recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-settings-manager.xml [deleted file]
recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfprint.xml [deleted file]
recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfwm4.xml [deleted file]
recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xsettings.xml [deleted file]

index 63d4427..62dc17a 100644 (file)
@@ -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 (file)
index 0000000..a035afb
Binary files /dev/null and b/recipes/branding/pandora-xfce-defaults/xfce4-conf.zip differ
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 (file)
index cef4af6..0000000
+++ /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 (file)
index 687a9ad..0000000
+++ /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 (file)
index f04815c..0000000
+++ /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 (file)
index e3dd358..0000000
+++ /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 (file)
index 1e59efe..0000000
+++ /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 (file)
index 73982b1..0000000
+++ /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 (file)
index c8098e9..0000000
+++ /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 (file)
index 87d44c0..0000000
+++ /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 (file)
index db35d4b..0000000
+++ /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 (file)
index cd21114..0000000
+++ /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 (file)
index cb0d5e9..0000000
+++ /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 (file)
index 71b4d94..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE config SYSTEM "config.dtd">
-<panels>
-       <panel>
-               <properties>
-                       <property name="size" value="32"/>
-                       <property name="monitor" value="0"/>
-                       <property name="screen-position" value="11"/>
-                       <property name="fullwidth" value="1"/>
-                       <property name="xoffset" value="0"/>
-                       <property name="yoffset" value="454"/>
-                       <property name="handlestyle" value="0"/>
-                       <property name="autohide" value="0"/>
-                       <property name="transparency" value="20"/>
-                       <property name="activetrans" value="0"/>
-               </properties>
-               <items>
-                       <item name="xfce4-menu" id="5"/>
-                       <item name="separator" id="6"/>
-                       <item name="launcher" id="8"/>
-                       <item name="launcher" id="9"/>
-                       <item name="launcher" id="12589452264"/>
-                       <item name="launcher" id="10"/>
-                       <item name="launcher" id="12589456725"/>
-                       <item name="separator" id="11"/>
-                       <item name="showdesktop" id="1"/>
-                       <item name="windowlist" id="12589448981"/>
-                       <item name="separator" id="13"/>
-                       <item name="pager" id="2"/>
-                       <item name="systray" id="4"/>
-                       <item name="clock" id="14"/>
-                       <item name="actions" id="12"/>
-               </items>
-       </panel>
-</panels>
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 (file)
index f926eac..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE config SYSTEM "config.dtd">
-<panels>
-       <panel>
-               <properties>
-                       <property name="size" value="50"/>
-                       <property name="monitor" value="0"/>
-                       <property name="screen-position" value="11"/>
-                       <property name="fullwidth" value="1"/>
-                       <property name="xoffset" value="0"/>
-                       <property name="yoffset" value="428"/>
-                       <property name="handlestyle" value="0"/>
-                       <property name="autohide" value="0"/>
-                       <property name="transparency" value="20"/>
-                       <property name="activetrans" value="0"/>
-               </properties>
-               <items>
-                       <item name="xfce4-menu" id="5"/>
-                       <item name="separator" id="6"/>
-                       <item name="launcher" id="8"/>
-                       <item name="launcher" id="9"/>
-                       <item name="launcher" id="12589452264"/>
-                       <item name="launcher" id="10"/>
-                       <item name="launcher" id="12589456725"/>
-                       <item name="separator" id="11"/>
-                       <item name="showdesktop" id="1"/>
-                       <item name="windowlist" id="12589448981"/>
-                       <item name="separator" id="13"/>
-                       <item name="pager" id="2"/>
-                       <item name="systray" id="4"/>
-                       <item name="clock" id="14"/>
-                       <item name="actions" id="12"/>
-               </items>
-       </panel>
-</panels>
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 (file)
index c46dd6a..0000000
+++ /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 (file)
index ea80172..0000000
+++ /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 (file)
index c46dd6a..0000000
+++ /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 (file)
index cf6433a..0000000
+++ /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 (file)
index 9c14a43..0000000
+++ /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 (file)
index 3dad081..0000000
+++ /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 (file)
index ccdd8fb..0000000
+++ /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 (file)
index c99de3c..0000000
+++ /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 (file)
index af45361..0000000
+++ /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 (file)
index c6fd4ed..0000000
+++ /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 (file)
index 723b841..0000000
+++ /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 <auto>:
-#   uid      : The real user ID
-#   gid      : The real group ID
-#   iocharset: To the EXO_MOUNT_IOCHARSET or LC_CTYPE environment variable.
-#
-
-[vfat]
-uid=<auto>
-shortname=winnt
-# FreeBSD specific option
-longnames=true
-
-[iso9660]
-uid=<auto>
-
-[udf]
-uid=<auto>
-iocharset=<auto>
-
-[ntfs]
-uid=<auto>
-
-[ntfs-3g]
-uid=<auto>
-# 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 (file)
index f46fbb2..0000000
+++ /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 <<EOF
-A crash occured in the panel
-Please report this to the xfce4-dev@xfce.org list
-or on http://bugs.xfce.org
-Meanwhile the panel will be restarted
-EOF
-                       cat >&2 <<EOF
-A crash occured in the panel
-Please report this to the xfce4-dev@xfce.org list
-or on http://bugs.xfce.org
-Meanwhile the panel will be restarted
-EOF
-                       $panel
-                       ret=$?
-               done
-               ;;
-esac
-
-if test $kill_sshagent -eq 1; then
-       eval `$sshagent -k`
-fi
-
-xsetroot -bg white -fg red  -solid black -cursor_name watch
diff --git a/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-desktop.xml b/recipes/branding/pandora-xfce-defaults/xfconf-xfce-perchannel-xml/xfce4-desktop.xml
deleted file mode 100644 (file)
index 41c323e..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-desktop" version="1.0">
-  <property name="backdrop" type="empty">
-    <property name="screen0" type="empty">
-      <property name="monitor0" type="empty">
-        <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/op-drops.png"/>
-        <property name="last-image" type="string" value="/usr/share/xfce4/backdrops/op-drops.png"/>
-        <property name="last-single-image" type="string" value="/usr/share/xfce4/backdrops/op-drops.png"/>
-      </property>
-    </property>
-  </property>
-  <property name="desktop-icons" type="empty">
-    <property name="style" type="int" value="1"/>
-    <property name="icon-size" type="uint" value="32"/>
-    <property name="file-icons" type="empty">
-      <property name="show-home" type="bool" value="true"/>
-      <property name="show-filesystem" type="bool" value="true"/>
-      <property name="show-removable" type="bool" value="true"/>
-      <property name="show-trash" type="bool" value="true"/>
-    </property>
-  </property>
-</channel>
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 (file)
index c9e743e..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-keyboard-shortcuts" version="1.0">
-  <property name="commands" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;F2" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="empty"/>
-      <property name="XF86Display" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Alt&gt;F2" type="string" value="xfrun4"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xflock4"/>
-      <property name="XF86Display" type="string" value="xrandr --auto"/>
-      <property name="override" type="bool" value="true"/>
-    </property>
-  </property>
-  <property name="xfwm4" type="empty">
-    <property name="default" type="empty">
-      <property name="&lt;Alt&gt;Insert" type="empty"/>
-      <property name="Escape" type="empty"/>
-      <property name="Left" type="empty"/>
-      <property name="Right" type="empty"/>
-      <property name="Up" type="empty"/>
-      <property name="Down" type="empty"/>
-      <property name="&lt;Alt&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="empty"/>
-      <property name="&lt;Alt&gt;Delete" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Down" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="empty"/>
-      <property name="&lt;Alt&gt;F4" type="empty"/>
-      <property name="&lt;Alt&gt;F6" type="empty"/>
-      <property name="&lt;Alt&gt;F7" type="empty"/>
-      <property name="&lt;Alt&gt;F8" type="empty"/>
-      <property name="&lt;Alt&gt;F9" type="empty"/>
-      <property name="&lt;Alt&gt;F10" type="empty"/>
-      <property name="&lt;Alt&gt;F11" type="empty"/>
-      <property name="&lt;Alt&gt;F12" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;End" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;Home" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_1" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_2" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_3" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_4" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_5" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_6" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_7" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_8" type="empty"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_9" type="empty"/>
-      <property name="&lt;Alt&gt;space" type="empty"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Right" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;d" type="empty"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Up" type="empty"/>
-      <property name="&lt;Control&gt;F1" type="empty"/>
-      <property name="&lt;Control&gt;F2" type="empty"/>
-      <property name="&lt;Control&gt;F3" type="empty"/>
-      <property name="&lt;Control&gt;F4" type="empty"/>
-      <property name="&lt;Control&gt;F5" type="empty"/>
-      <property name="&lt;Control&gt;F6" type="empty"/>
-      <property name="&lt;Control&gt;F7" type="empty"/>
-      <property name="&lt;Control&gt;F8" type="empty"/>
-      <property name="&lt;Control&gt;F9" type="empty"/>
-      <property name="&lt;Control&gt;F10" type="empty"/>
-      <property name="&lt;Control&gt;F11" type="empty"/>
-      <property name="&lt;Control&gt;F12" type="empty"/>
-    </property>
-    <property name="custom" type="empty">
-      <property name="&lt;Control&gt;F8" type="string" value="workspace_8_key"/>
-      <property name="&lt;Control&gt;F10" type="string" value="workspace_10_key"/>
-      <property name="&lt;Control&gt;F11" type="string" value="workspace_11_key"/>
-      <property name="&lt;Control&gt;F12" type="string" value="workspace_12_key"/>
-      <property name="&lt;Control&gt;F9" type="string" value="workspace_9_key"/>
-      <property name="&lt;Alt&gt;F10" type="string" value="maximize_window_key"/>
-      <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
-      <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Up" type="string" value="up_workspace_key"/>
-      <property name="Escape" type="string" value="cancel_key"/>
-      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="string" value="cycle_reverse_windows_key"/>
-      <property name="&lt;Alt&gt;space" type="string" value="popup_menu_key"/>
-      <property name="&lt;Alt&gt;Delete" type="string" value="del_workspace_key"/>
-      <property name="&lt;Alt&gt;F4" type="string" value="close_window_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="string" value="lower_window_key"/>
-      <property name="&lt;Alt&gt;F6" type="string" value="stick_window_key"/>
-      <property name="&lt;Alt&gt;F8" type="string" value="resize_window_key"/>
-      <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
-      <property name="&lt;Alt&gt;F7" type="string" value="move_window_key"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_key"/>
-      <property name="&lt;Control&gt;F5" type="string" value="workspace_5_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Left" type="string" value="left_workspace_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Down" type="string" value="down_workspace_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_1" type="string" value="move_window_workspace_1_key"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_3" type="string" value="move_window_workspace_3_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_4" type="string" value="move_window_workspace_4_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_5" type="string" value="move_window_workspace_5_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_6" type="string" value="move_window_workspace_6_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_7" type="string" value="move_window_workspace_7_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_2" type="string" value="move_window_workspace_2_key"/>
-      <property name="Left" type="string" value="left_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_9" type="string" value="move_window_workspace_9_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;KP_8" type="string" value="move_window_workspace_8_key"/>
-      <property name="Down" type="string" value="down_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;Home" type="string" value="move_window_prev_workspace_key"/>
-      <property name="&lt;Alt&gt;&lt;Control&gt;End" type="string" value="move_window_next_workspace_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;Right" type="string" value="right_workspace_key"/>
-      <property name="&lt;Control&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_key"/>
-      <property name="Right" type="string" value="right_key"/>
-      <property name="&lt;Alt&gt;Tab" type="string" value="cycle_windows_key"/>
-      <property name="&lt;Control&gt;F1" type="string" value="workspace_1_key"/>
-      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="string" value="raise_window_key"/>
-      <property name="&lt;Control&gt;F2" type="string" value="workspace_2_key"/>
-      <property name="&lt;Control&gt;F3" type="string" value="workspace_3_key"/>
-      <property name="Up" type="string" value="up_key"/>
-      <property name="&lt;Control&gt;&lt;Alt&gt;d" type="string" value="show_desktop_key"/>
-      <property name="&lt;Control&gt;F7" type="string" value="workspace_7_key"/>
-      <property name="&lt;Alt&gt;Insert" type="string" value="add_workspace_key"/>
-      <property name="&lt;Control&gt;F6" type="string" value="workspace_6_key"/>
-      <property name="&lt;Control&gt;F4" type="string" value="workspace_4_key"/>
-      <property name="override" type="bool" value="true"/>
-    </property>
-  </property>
-  <property name="providers" type="array">
-    <value type="string" value="commands"/>
-    <value type="string" value="xfwm4"/>
-  </property>
-</channel>
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 (file)
index 54edd93..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-mixer" version="1.0">
-  <property name="sound-card" type="string" value="omap3pandoraAlsamixer"/>
-  <property name="window-height" type="int" value="400"/>
-  <property name="window-width" type="int" value="600"/>
-</channel>
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 (file)
index cee2f4d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-notifyd" version="1.0">
-  <property name="notify-location" type="uint" value="3"/>
-  <property name="theme" type="string" value="Default"/>
-  <property name="initial-opacity" type="double" value="0.900000"/>
-  <property name="expire-timeout" type="int" value="8"/>
-</channel>
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 (file)
index 938d232..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-session" version="1.0">
-  <property name="general" type="empty">
-    <property name="FailsafeSessionName" type="empty"/>
-    <property name="SessionName" type="string" value="Default"/>
-    <property name="SaveOnExit" type="bool" value="true"/>
-  </property>
-  <property name="sessions" type="empty">
-    <property name="Failsafe" type="empty">
-      <property name="IsFailsafe" type="empty"/>
-      <property name="Count" type="empty"/>
-      <property name="Client0_Command" type="empty"/>
-      <property name="Client0_PerScreen" type="empty"/>
-      <property name="Client1_Command" type="empty"/>
-      <property name="Client1_PerScreen" type="empty"/>
-      <property name="Client2_Command" type="empty"/>
-      <property name="Client2_PerScreen" type="empty"/>
-      <property name="Client3_Command" type="empty"/>
-      <property name="Client3_PerScreen" type="empty"/>
-      <property name="Client4_Command" type="empty"/>
-      <property name="Client4_PerScreen" type="empty"/>
-    </property>
-  </property>
-  <property name="splash" type="empty">
-    <property name="Engine" type="string" value="mice"/>
-  </property>
-  <property name="chooser" type="empty">
-    <property name="AlwaysDisplay" type="bool" value="false"/>
-  </property>
-</channel>
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 (file)
index 691d3cd..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-settings-manager" version="1.0">
-  <property name="window-width" type="int" value="800"/>
-  <property name="window-height" type="int" value="435"/>
-</channel>
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 (file)
index 4dce890..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfprint" version="1.0">
-  <property name="printing-system" type="string" value="none"/>
-</channel>
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 (file)
index 449e050..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfwm4" version="1.0">
-  <property name="general" type="empty">
-    <property name="activate_action" type="string" value="bring"/>
-    <property name="borderless_maximize" type="bool" value="true"/>
-    <property name="box_move" type="bool" value="false"/>
-    <property name="box_resize" type="bool" value="true"/>
-    <property name="button_layout" type="string" value="O|SHMC"/>
-    <property name="button_offset" type="int" value="0"/>
-    <property name="button_spacing" type="int" value="0"/>
-    <property name="click_to_focus" type="bool" value="true"/>
-    <property name="focus_delay" type="int" value="250"/>
-    <property name="cycle_draw_frame" type="bool" value="true"/>
-    <property name="cycle_hidden" type="bool" value="true"/>
-    <property name="cycle_minimum" type="bool" value="true"/>
-    <property name="cycle_workspaces" type="bool" value="false"/>
-    <property name="dbl_click_time" type="int" value="400"/>
-    <property name="double_click_action" type="string" value="maximize"/>
-    <property name="easy_click" type="string" value="Alt"/>
-    <property name="focus_hint" type="bool" value="true"/>
-    <property name="focus_new" type="bool" value="true"/>
-    <property name="frame_opacity" type="int" value="100"/>
-    <property name="full_width_title" type="bool" value="true"/>
-    <property name="inactive_opacity" type="int" value="100"/>
-    <property name="maximized_offset" type="int" value="0"/>
-    <property name="move_opacity" type="int" value="100"/>
-    <property name="placement_ratio" type="int" value="20"/>
-    <property name="placement_mode" type="string" value="center"/>
-    <property name="popup_opacity" type="int" value="100"/>
-    <property name="prevent_focus_stealing" type="bool" value="false"/>
-    <property name="raise_delay" type="int" value="250"/>
-    <property name="raise_on_click" type="bool" value="true"/>
-    <property name="raise_on_focus" type="bool" value="false"/>
-    <property name="raise_with_any_button" type="bool" value="true"/>
-    <property name="repeat_urgent_blink" type="bool" value="false"/>
-    <property name="resize_opacity" type="int" value="100"/>
-    <property name="restore_on_move" type="bool" value="true"/>
-    <property name="scroll_workspaces" type="bool" value="false"/>
-    <property name="shadow_delta_height" type="int" value="0"/>
-    <property name="shadow_delta_width" type="int" value="0"/>
-    <property name="shadow_delta_x" type="int" value="0"/>
-    <property name="shadow_delta_y" type="int" value="-3"/>
-    <property name="shadow_opacity" type="int" value="50"/>
-    <property name="show_app_icon" type="bool" value="false"/>
-    <property name="show_dock_shadow" type="bool" value="false"/>
-    <property name="show_frame_shadow" type="bool" value="false"/>
-    <property name="show_popup_shadow" type="bool" value="false"/>
-    <property name="snap_resist" type="bool" value="false"/>
-    <property name="snap_to_border" type="bool" value="true"/>
-    <property name="snap_to_windows" type="bool" value="false"/>
-    <property name="snap_width" type="int" value="10"/>
-    <property name="theme" type="string" value="Daloa"/>
-    <property name="title_alignment" type="string" value="center"/>
-    <property name="title_font" type="string" value="Sans Bold 9"/>
-    <property name="title_horizontal_offset" type="int" value="0"/>
-    <property name="title_shadow_active" type="string" value="false"/>
-    <property name="title_shadow_inactive" type="string" value="false"/>
-    <property name="title_vertical_offset_active" type="int" value="0"/>
-    <property name="title_vertical_offset_inactive" type="int" value="0"/>
-    <property name="toggle_workspaces" type="bool" value="false"/>
-    <property name="unredirect_overlays" type="bool" value="true"/>
-    <property name="urgent_blink" type="bool" value="false"/>
-    <property name="use_compositing" type="bool" value="true"/>
-    <property name="workspace_count" type="int" value="2"/>
-    <property name="wrap_cycle" type="bool" value="true"/>
-    <property name="wrap_layout" type="bool" value="true"/>
-    <property name="wrap_resistance" type="int" value="10"/>
-    <property name="wrap_windows" type="bool" value="true"/>
-    <property name="wrap_workspaces" type="bool" value="false"/>
-    <property name="workspace_names" type="array">
-      <value type="string" value="1"/>
-      <value type="string" value="2"/>
-    </property>
-  </property>
-</channel>
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 (file)
index 7f54904..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
-  <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Xfce"/>
-    <property name="IconThemeName" type="string" value="elementary"/>
-  </property>
-  <property name="Xft" type="empty">
-    <property name="DPI" type="empty"/>
-  </property>
-  <property name="Gtk" type="empty">
-    <property name="MenuImages" type="bool" value="true"/>
-    <property name="CanChangeAccels" type="bool" value="true"/>
-    <property name="ToolbarStyle" type="string" value="icons"/>
-  </property>
-</channel>