- make it work with Xfce4.6

5 files changed, 128 insertions, 10 deletions

diff --git a/common/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/Flash/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index 8397953..8397953 100644
--- a/common/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/Flash/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/Free/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/Free/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
new file mode 100644
index 0000000..8397953
--- /dev/null
+++ b/Free/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xsettings" version="1.0">
+  <property name="Net" type="empty">
+    <property name="DoubleClickTime" type="int" value="250"/>
+    <property name="DoubleClickDistance" type="int" value="5"/>
+    <property name="DndDragThreshold" type="int" value="8"/>
+    <property name="CursorBlink" type="bool" value="true"/>
+    <property name="CursorBlinkTime" type="int" value="1200"/>
+    <property name="ThemeName" type="string" value="Ia Ora Smooth"/>
+    <property name="IconThemeName" type="string" value="Tango"/>
+    <property name="SoundThemeName" type="string" value="default"/>
+    <property name="EnableEventSounds" type="bool" value="true"/>
+    <property name="EnableInputFeedbackSounds" type="bool" value="true"/>
+  </property>
+  <property name="Xft" type="empty">
+    <property name="Antialias" type="int" value="1"/>
+    <property name="Hinting" type="int" value="-1"/>
+    <property name="HintStyle" type="string" value="hintslight"/>
+    <property name="RGBA" type="string" value="none"/>
+    <property name="DPI" type="int" value="-1"/>
+  </property>
+  <property name="Gtk" type="empty">
+    <property name="CanChangeAccels" type="bool" value="false"/>
+    <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
+    <property name="FontName" type="string" value="Sans 10"/>
+    <property name="IconSizes" type="string" value=""/>
+    <property name="KeyThemeName" type="string" value=""/>
+    <property name="ToolbarStyle" type="string" value="both"/>
+    <property name="ToolbarIconSize" type="int" value="3"/>
+    <property name="IMPreeditStyle" type="string" value=""/>
+    <property name="IMStatusStyle" type="string" value=""/>
+    <property name="MenuImages" type="bool" value="true"/>
+    <property name="ButtonImages" type="bool" value="true"/>
+    <property name="MenuBarAccel" type="string" value="F10"/>
+    <property name="CursorThemeName" type="string" value=""/>
+    <property name="CursorThemeSize" type="int" value="0"/>
+  </property>
+  <property name="Initialized" type="uint" value="1"/>
+</channel>
diff --git a/Makefile b/Makefile
index b62d1b1..ca5dd46 100644
--- a/Makefile
+++ b/Makefile
@@ -16,13 +16,11 @@ install:
 	install -m 644 common/autostart/* $(DESTDIR)$(xfceconfdir)/autostart/
 	-install -d $(DESTDIR)$(xfceconfdir)/xfce4
 	-install -d $(DESTDIR)$(xfceconfdir)/xfce4/desktop
-	-install -d $(DESTDIR)$(xfceconfdir)/xfce4/notication-daemon-xfce
 	-install -d $(DESTDIR)$(xfceconfdir)/xfce4/panel
 	-install -d $(DESTDIR)$(xfceconfdir)/xfce4/theme
 	-install -d $(DESTDIR)$(xfceconfdir)/xfce4/volstatus
 	-install -d $(DESTDIR)$(PREFIX)/bin
 	install -m 644 common/xfce4/desktop/* $(DESTDIR)$(xfceconfdir)/xfce4/desktop/
-	install -m 644 common/xfce4/notication-daemon-xfce/* $(DESTDIR)$(xfceconfdir)/xfce4/notication-daemon-xfce/
 	install -m 644 common/xfce4/panel/* $(DESTDIR)$(xfceconfdir)/xfce4/panel/
 	install -m 644 common/xfce4/theme/* $(DESTDIR)$(xfceconfdir)/xfce4/theme/
 	install -m 644 common/xfce4/volstatus/* $(DESTDIR)$(xfceconfdir)/xfce4/volstatus/
@@ -31,17 +29,17 @@ install:
 	install -m 755 tools/xfce4-update-config $(DESTDIR)$(PREFIX)/bin
 
 	-install -d $(DESTDIR)$(xfceprofdir)
-	-install -d $(DESTDIR)$(xfceprofdir)/Flash/xfce4/mcs_settings
-	install -m 644 Flash/xfce4/mcs_settings/*.xml $(DESTDIR)$(xfceprofdir)/Flash/xfce4/mcs_settings/
+	-install -d $(DESTDIR)$(xfceprofdir)/Flash/xfce4/xfconf/
+	install -m 644 Flash/xfce4/xfconf/xfce-perchannel-xml/*.xml $(DESTDIR)$(xfceprofdir)/Flash/xfce4/xfconf/xfce-perchannel-xml
 
-	-install -d $(DESTDIR)$(xfceprofdir)/Free/xfce4/mcs_settings
-	install -m 644 Free/xfce4/mcs_settings/*.xml $(DESTDIR)$(xfceprofdir)/Free/xfce4/mcs_settings/
+	-install -d $(DESTDIR)$(xfceprofdir)/Free/xfce4/xfconf/xfce-perchannel-xml/
+	install -m 644 Free/xfce4/xfconf/xfce-perchannel-xml/*.xml $(DESTDIR)$(xfceprofdir)/Free/xfce4/xfconf/xfce-perchannel-xml
 
-	-install -d $(DESTDIR)$(xfceprofdir)/One/xfce4/mcs_settings
-	install -m 644 One/xfce4/mcs_settings/*.xml $(DESTDIR)$(xfceprofdir)/One/xfce4/mcs_settings/
+	-install -d $(DESTDIR)$(xfceprofdir)/One/xfce4/xfconf/xfce-perchannel-xml/
+	install -m 644 One/xfce4/xfconf/xfce-perchannel-xml/*.xml $(DESTDIR)$(xfceprofdir)/One/xfce4/xfconf/xfce-perchannel-xml
 
-	-install -d $(DESTDIR)$(xfceprofdir)/Powerpack/xfce4/mcs_settings
-	install -m 644 Powerpack/xfce4/mcs_settings/*.xml $(DESTDIR)$(xfceprofdir)/Powerpack/xfce4/mcs_settings/
+	-install -d $(DESTDIR)$(xfceprofdir)/Powerpack/xfce4/xfconf/xfce-perchannel-xml/
+	install -m 644 Powerpack/xfce4/xfconf/xfce-perchannel-xml/*.xml $(DESTDIR)$(xfceprofdir)/Powerpack/xfce4/xfconf/xfce-perchannel-xml
 
 cleandist:
 	rm -rf $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).tar.bz2
diff --git a/One/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/One/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
new file mode 100644
index 0000000..8397953
--- /dev/null
+++ b/One/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xsettings" version="1.0">
+  <property name="Net" type="empty">
+    <property name="DoubleClickTime" type="int" value="250"/>
+    <property name="DoubleClickDistance" type="int" value="5"/>
+    <property name="DndDragThreshold" type="int" value="8"/>
+    <property name="CursorBlink" type="bool" value="true"/>
+    <property name="CursorBlinkTime" type="int" value="1200"/>
+    <property name="ThemeName" type="string" value="Ia Ora Smooth"/>
+    <property name="IconThemeName" type="string" value="Tango"/>
+    <property name="SoundThemeName" type="string" value="default"/>
+    <property name="EnableEventSounds" type="bool" value="true"/>
+    <property name="EnableInputFeedbackSounds" type="bool" value="true"/>
+  </property>
+  <property name="Xft" type="empty">
+    <property name="Antialias" type="int" value="1"/>
+    <property name="Hinting" type="int" value="-1"/>
+    <property name="HintStyle" type="string" value="hintslight"/>
+    <property name="RGBA" type="string" value="none"/>
+    <property name="DPI" type="int" value="-1"/>
+  </property>
+  <property name="Gtk" type="empty">
+    <property name="CanChangeAccels" type="bool" value="false"/>
+    <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
+    <property name="FontName" type="string" value="Sans 10"/>
+    <property name="IconSizes" type="string" value=""/>
+    <property name="KeyThemeName" type="string" value=""/>
+    <property name="ToolbarStyle" type="string" value="both"/>
+    <property name="ToolbarIconSize" type="int" value="3"/>
+    <property name="IMPreeditStyle" type="string" value=""/>
+    <property name="IMStatusStyle" type="string" value=""/>
+    <property name="MenuImages" type="bool" value="true"/>
+    <property name="ButtonImages" type="bool" value="true"/>
+    <property name="MenuBarAccel" type="string" value="F10"/>
+    <property name="CursorThemeName" type="string" value=""/>
+    <property name="CursorThemeSize" type="int" value="0"/>
+  </property>
+  <property name="Initialized" type="uint" value="1"/>
+</channel>
diff --git a/Powerpack/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/Powerpack/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
new file mode 100644
index 0000000..8397953
--- /dev/null
+++ b/Powerpack/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xsettings" version="1.0">
+  <property name="Net" type="empty">
+    <property name="DoubleClickTime" type="int" value="250"/>
+    <property name="DoubleClickDistance" type="int" value="5"/>
+    <property name="DndDragThreshold" type="int" value="8"/>
+    <property name="CursorBlink" type="bool" value="true"/>
+    <property name="CursorBlinkTime" type="int" value="1200"/>
+    <property name="ThemeName" type="string" value="Ia Ora Smooth"/>
+    <property name="IconThemeName" type="string" value="Tango"/>
+    <property name="SoundThemeName" type="string" value="default"/>
+    <property name="EnableEventSounds" type="bool" value="true"/>
+    <property name="EnableInputFeedbackSounds" type="bool" value="true"/>
+  </property>
+  <property name="Xft" type="empty">
+    <property name="Antialias" type="int" value="1"/>
+    <property name="Hinting" type="int" value="-1"/>
+    <property name="HintStyle" type="string" value="hintslight"/>
+    <property name="RGBA" type="string" value="none"/>
+    <property name="DPI" type="int" value="-1"/>
+  </property>
+  <property name="Gtk" type="empty">
+    <property name="CanChangeAccels" type="bool" value="false"/>
+    <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
+    <property name="FontName" type="string" value="Sans 10"/>
+    <property name="IconSizes" type="string" value=""/>
+    <property name="KeyThemeName" type="string" value=""/>
+    <property name="ToolbarStyle" type="string" value="both"/>
+    <property name="ToolbarIconSize" type="int" value="3"/>
+    <property name="IMPreeditStyle" type="string" value=""/>
+    <property name="IMStatusStyle" type="string" value=""/>
+    <property name="MenuImages" type="bool" value="true"/>
+    <property name="ButtonImages" type="bool" value="true"/>
+    <property name="MenuBarAccel" type="string" value="F10"/>
+    <property name="CursorThemeName" type="string" value=""/>
+    <property name="CursorThemeSize" type="int" value="0"/>
+  </property>
+  <property name="Initialized" type="uint" value="1"/>
+</channel>