Workaround menu handling errors in pyxdg (LP: #1833863)

Xubuntu · Nov 3, 2019 · 7b9ad09 · 7b9ad09
1 parent 3d89b1b
commit 7b9ad09
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -4,8 +4,11 @@ xubuntu-default-settings (19.10.2) UNRELEASED; urgency=medium
     - Drop workspace labels, inconsistent with 5+ workspaces (LP: #1829778)
   * etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml:
     - Set the Xubuntu wallpaper as default for up to 4 displays
+  * etc/xdg/xdg-xubuntu/menus/xfce-applications.menu,
+    etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu:
+    - Workaround menu handling errors in pyxdg (LP: #1833863)
 
- -- Sean Davis <smd.seandavis@gmail.com>  Fri, 01 Nov 2019 06:48:16 -0400
+ -- Sean Davis <smd.seandavis@gmail.com>  Sun, 03 Nov 2019 04:09:18 -0500
 
 xubuntu-default-settings (19.10.1) eoan; urgency=medium
 

diff --git a/etc/xdg/xdg-xubuntu/menus/xfce-applications.menu b/etc/xdg/xdg-xubuntu/menus/xfce-applications.menu
@@ -25,7 +25,8 @@
         <Separator/>
         <Filename>xfce-settings-manager.desktop</Filename>
         <Separator/>
-        <Merge type="all"/>
+        <Merge type="menus"/>
+        <Merge type="files"/>
         <Separator/>
         <Filename>org.gnome.Software.desktop</Filename>
         <Separator/>
@@ -57,7 +58,8 @@
             <Filename>xfce4-run.desktop</Filename>
             <Filename>xfce4-appfinder.desktop</Filename>
             <Separator/>
-            <Merge type="all"/>
+            <Merge type="menus"/>
+            <Merge type="files"/>
         </Layout>
     </Menu>
 

diff --git a/etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu b/etc/xdg/xdg-xubuntu/menus/xfce-settings-manager.menu
@@ -8,13 +8,14 @@
   <DefaultDirectoryDirs/>
   <DefaultMergeDirs/>
 
-   <Layout>
-     <Menuname>Personal</Menuname>
-     <Menuname>Hardware</Menuname>
-     <Menuname>System</Menuname>
-     <Menuname>Other</Menuname>
-     <Merge type="all" />
-   </Layout>
+  <Layout>
+    <Menuname>Personal</Menuname>
+    <Menuname>Hardware</Menuname>
+    <Menuname>System</Menuname>
+    <Menuname>Other</Menuname>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </Layout>
 
   <Include>
     <And>