switch back to xvkbd, because onboard cannot be preseeded to start hidden

diff --git a/modules/xfce.mk b/modules/xfce.mk
index a2cc04f1cc87e3e044bff359c0d3966a712dfa87..20672816363ad1d69508e152dc2fc2b6bc76ab71 100644 (file)
--- a/modules/xfce.mk
+++ b/modules/xfce.mk
@@ -1,4 +1,5 @@
-PACKAGES += xfce4 xauth x11-xserver-utils x2x blueman xfce4-terminal xfce4-clipman-plugin xfce4-whiskermenu-plugin thunar gvfs gvfs-backends gvfs-fuse xscreensaver policykit-1 onboard
+PACKAGES += blueman gvfs gvfs-backends gvfs-fuse policykit-1 thunar x11-xserver-utils x2x xauth xfce4 xfce4-clipman-plugin xfce4-terminal xfce4-whiskermenu-plugin xscreensaver xvkbd
+
 
 .PHONY: _xfce
 _config: _xfce

diff --git a/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 4c3d00f928465e48a61b58acbd9538f35eabd3c0..58b0e8fdd960a707670313d72a84984695596250 100644 (file)
--- a/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -22,7 +22,7 @@
         <value type="int" value="310"/>
         <value type="int" value="320"/>
         <value type="int" value="330"/>
-        <!--value type="int" value="340"/-->
+        <value type="int" value="340"/>
       </property>
     </property>
   </property>
@@ -61,8 +61,8 @@
       <property name="show-frame" type="bool" value="false"/>
     </property>
     <property name="plugin-330" type="string" value="clock"/>
-    <!--property name="plugin-340" type="string" value="launcher"><property name="items" type="array">
+    <property name="plugin-340" type="string" value="launcher"><property name="items" type="array">
       <value type="string" value="/etc/xdg/xfce4/panel/launcher-xvkbd/xvkbd.desktop"/>
-    </property></property-->
+    </property></property>
   </property>
 </channel>