Xubuntu Default Settings

Merge lp:~thad-fisch-deactivatedaccount/xubuntu-default-settings/lp1292290 into lp:~xubuntu-dev/xubuntu-default-settings/trunk

  1. lp1292290
  2. Merge into trunk
Proposed by Thaddaeus Tintenfisch
Status: Merged
Merged at revision: 543
Proposed branch: lp:~thad-fisch-deactivatedaccount/xubuntu-default-settings/lp1292290
Merge into: lp:~xubuntu-dev/xubuntu-default-settings/trunk
Diff against target: 11 lines (+1/-0)
1 file modified
etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml (+1/-0)
To merge this branch: bzr merge lp:~thad-fisch-deactivatedaccount/xubuntu-default-settings/lp1292290
Reviewer Review Type Date Requested Status
Sean Davis Approve
Review via email: mp+246842@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Sean Davis (bluesabre) wrote :

Already merged, so approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml'
2--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2014-04-07 22:15:55 +0000
3+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2015-01-18 12:07:16 +0000
4@@ -51,6 +51,7 @@
5 <property name="&lt;Alt&gt;F7" type="string" value="maximize_window_key"/>
6 <property name="&lt;Alt&gt;F8" type="string" value="stick_window_key"/>
7 <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
8+ <property name="&lt;Alt&gt;F10" type="empty"/>
9 <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
10 <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
11 <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: