← Back to team overview

xubuntu-dev team mailing list archive

[Merge] lp:~thad-fisch/xubuntu-default-settings/lp1292290 into lp:xubuntu-default-settings

 

Thaddaeus Tintenfisch has proposed merging lp:~thad-fisch/xubuntu-default-settings/lp1292290 into lp:xubuntu-default-settings.

Requested reviews:
  Xubuntu Developers (xubuntu-dev)
Related bugs:
  Bug #1292290 in xfce4-settings (Ubuntu): "Window manager keybindings don't work after reboot"
  https://bugs.launchpad.net/ubuntu/+source/xfce4-settings/+bug/1292290

For more details, see:
https://code.launchpad.net/~thad-fisch/xubuntu-default-settings/lp1292290/+merge/246842

This simple change prevents xfce4-settings from adding two definitions for the maximize window action to the user keyboard shortcuts file (result of mixing the Xubuntu and Xfce keyboard shortcut files from /etc/xdg/).

The underlying bug in xfce4-settings still needs to be resolved upstream.

https://bugzilla.xfce.org/show_bug.cgi?id=10959
-- 
Your team Xubuntu Developers is requested to review the proposed merge of lp:~thad-fisch/xubuntu-default-settings/lp1292290 into lp:xubuntu-default-settings.
=== modified file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml'
--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml	2014-04-07 22:15:55 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml	2015-01-18 12:07:16 +0000
@@ -51,6 +51,7 @@
       <property name="&lt;Alt&gt;F7" type="string" value="maximize_window_key"/>
       <property name="&lt;Alt&gt;F8" type="string" value="stick_window_key"/>
       <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
+      <property name="&lt;Alt&gt;F10" type="empty"/>
       <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;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>


Follow ups