Merge lp:~brunonova/ubuntu/trusty/xubuntu-default-settings/lp1310264 into lp:ubuntu/trusty-proposed/xubuntu-default-settings

[Bruno Nova]

This commit backports the change that adds the Settings submenu to the Whisker menu.

The change was copied from here: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/utopic/xubuntu-default-settings/utopic/revision/147/etc/xdg/xdg-xubuntu/menus/xfce-applications.menu
The original author of that change is Sean Davis.

The linked bug was not nominated for Trusty yet, but I think the missing Settings submenu is a usability issue that should be addressed.

[Sebastien Bacher (seb128)]

Thanks, I've added a changelog and applied that to the trusty version
http://launchpadlibrarian.net/190834608/xubuntu-default-settings_14.04.6_source.changes

review: Approve

[Sebastien Bacher (seb128)]

https://launchpad.net/ubuntu/+source/xubuntu-default-settings/14.04.6

=== modified file 'etc/xdg/xdg-xubuntu/menus/xfce-applications.menu'
--- etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2013-06-04 20:33:00 +0000
+++ etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2014-10-20 18:37:35 +0000
@@ -10,7 +10,6 @@
     <Include>
         <Filename>exo-web-browser.desktop</Filename>
         <Filename>exo-mail-reader.desktop</Filename>
-        <Filename>xfce-settings-manager.desktop</Filename>
         <Filename>ubuntu-software-center.desktop</Filename>
         <Filename>xfhelp4.desktop</Filename>
         <Filename>xubuntu-website.desktop</Filename>
@@ -23,8 +22,6 @@
         <Filename>exo-web-browser.desktop</Filename>
         <Filename>exo-mail-reader.desktop</Filename>
         <Separator/>
-        <Filename>xfce-settings-manager.desktop</Filename>
-        <Separator/>
         <Merge type="all"/>
         <Separator/>
         <Filename>ubuntu-software-center.desktop</Filename>
@@ -128,6 +125,26 @@
     </Menu>
 
     <Menu>
+        <Name>Settings</Name>
+        <Directory>xfce-settings.directory</Directory>
+        <Include>
+            <Category>Settings</Category>
+        </Include>
+        <Exclude>
+            <Or>
+                <Filename>exo-mail-reader.desktop</Filename>
+                <Filename>exo-web-browser.desktop</Filename>
+            </Or>
+        </Exclude>
+
+        <Layout>
+            <Filename>xfce-settings-manager.desktop</Filename>
+            <Separator/>
+            <Merge type="all"/>
+        </Layout>
+    </Menu>
+
+    <Menu>
         <Name>System</Name>
         <Directory>xfce-system.directory</Directory>
         <Include>