Merge branch 'master' into school-master

branding.spec

@@ -294,6 +294,8 @@ echo $lang > lang
 [ "`readlink %_sysconfdir/bootsplash/themes/current`" != %theme ] ||
     %__rm -f %_sysconfdir/bootsplash/themes/current
 
+%post xfce-settings
+cat /etc/sysconfig/xinitrc.xfce >> /etc/sysconfig/xinitrc
 
 %files alterator
 %config %_altdir/*.rcc

configure.ac

@@ -58,5 +58,6 @@ AC_CONFIG_FILES([
 		 gnome-settings/metacity-theme-1.xml
 		 components/ahttpd/styles/alterator.css
 		 kde3-styles-splash/Theme.rc
+		 xfce-settings/xinitrc
 ])
 AC_OUTPUT

kde4-settings/kde4/share/config/default-apps

 firefox
 oowriter
+kde4-dolphin

xfce-settings/etcskel/.config/xfce4/panel/panels.xml

@@ -25,7 +25,7 @@
 			<item name="pager" id="11888131361"/>
 			<item name="tasklist" id="11888145122"/>
 			<item name="xkb-plugin" id="11896827708"/>
-			<item name="xfce4-mixer" id="11888134323"/>
+			<item name="xfce4-mixer-plugin" id="11888134323"/>
 			<item name="systray" id="11888132202"/>
 			<item name="clock" id="14"/>
 		</items>

xfce-settings/etcskel/.config/xfce4/panel/xfce4-mixer-11888134323.rc

-[mixer-plugin]
-Device=default
-LauncherCommand=xfce4-mixer
-LauncherRunInTerminal=false
-LauncherUseStartupNotification=false
-

xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-11896827708.rc

-display_type=0
-per_app_layout=1
-default_group=0
-

xfce-settings/xinitrc.in

+XSETROOT='xsetroot -solid #@MIDDLE_COLOR_HEX@'