Merge pull request #12730 from affederaffe/fix-vala-panel-global-menu

Use Tmds.DBus.SourceGenerator 0.0.10

Author: jmacato

src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Tmds.DBus.Protocol" Version="0.15.0" />
-    <PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.8" PrivateAssets="All" />
+    <PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.10" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
@@ -26,19 +26,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="DBusXml/DBus.xml" DBusGeneratorMode="Proxy" />
-    <AdditionalFiles Include="DBusXml/StatusNotifierWatcher.xml" DBusGeneratorMode="Proxy" />
     <AdditionalFiles Include="DBusXml/com.canonical.AppMenu.Registrar.xml" DBusGeneratorMode="Proxy" />
+    <AdditionalFiles Include="DBusXml/com.canonical.dbusmenu.xml" DBusGeneratorMode="Handler" />
+
     <AdditionalFiles Include="DBusXml/org.fcitx.Fcitx.InputContext.xml" DBusGeneratorMode="Proxy" />
     <AdditionalFiles Include="DBusXml/org.fcitx.Fcitx.InputMethod.xml" DBusGeneratorMode="Proxy" />
     <AdditionalFiles Include="DBusXml/org.fcitx.Fcitx.InputContext1.xml" DBusGeneratorMode="Proxy" />
     <AdditionalFiles Include="DBusXml/org.fcitx.Fcitx.InputMethod1.xml" DBusGeneratorMode="Proxy" />
+
+    <AdditionalFiles Include="DBusXml/org.freedesktop.DBus.xml" DBusGeneratorMode="Proxy" />
     <AdditionalFiles Include="DBusXml/org.freedesktop.IBus.Portal.xml" DBusGeneratorMode="Proxy" />
     <AdditionalFiles Include="DBusXml/org.freedesktop.portal.FileChooser.xml" DBusGeneratorMode="Proxy" />
     <AdditionalFiles Include="DBusXml/org.freedesktop.portal.Request.xml" DBusGeneratorMode="Proxy" />
     <AdditionalFiles Include="DBusXml/org.freedesktop.portal.Settings.xml" DBusGeneratorMode="Proxy" />
-    <AdditionalFiles Include="DBusXml/DBusMenu.xml" DBusGeneratorMode="Handler" />
-    <AdditionalFiles Include="DBusXml/StatusNotifierItem.xml" DBusGeneratorMode="Handler" />
+
+    <AdditionalFiles Include="DBusXml/org.kde.StatusNotifierWatcher.xml" DBusGeneratorMode="Proxy" />
+    <AdditionalFiles Include="DBusXml/org.kde.StatusNotifierItem.xml" DBusGeneratorMode="Handler" />
   </ItemGroup>
 
 </Project>

src/Avalonia.FreeDesktop/DBusMenuExporter.cs

@@ -58,6 +58,7 @@ public DBusMenuExporterImpl(Connection connection, string path) : this()
 
             private DBusMenuExporterImpl()
             {
+                BackingProperties.Version = 4;
                 BackingProperties.Status = string.Empty;
                 BackingProperties.TextDirection = string.Empty;
                 BackingProperties.IconThemePath = Array.Empty<string>();
@@ -280,11 +281,9 @@ private int GetId(NativeMenuItemBase item)
                             if (loader is not null)
                             {
                                 var icon = loader.LoadIcon(item.Icon.PlatformImpl.Item);
-
                                 using var ms = new MemoryStream();
                                 icon.Save(ms);
-                                return new DBusVariantItem("ay",
-                                    new DBusArrayItem(DBusType.Byte, ms.ToArray().Select(static x => new DBusByteItem(x))));
+                                return new DBusVariantItem("ay", new DBusByteArrayItem(ms.ToArray()));
                             }
                         }
                     }
@@ -325,7 +324,7 @@ private static Dictionary<string, DBusVariantItem> GetProperties((NativeMenuItem
                         children[c] = new DBusVariantItem("(ia{sv}av)", new DBusStructItem(new DBusItem[]
                         {
                             new DBusInt32Item(layout.Item1),
-                            new DBusArrayItem(DBusType.DictEntry, layout.Item2.Select(static x => new DBusDictEntryItem(new DBusStringItem(x.Key), x.Value))),
+                            new DBusArrayItem(DBusType.DictEntry, layout.Item2.Select(static x => new DBusDictEntryItem(new DBusStringItem(x.Key), x.Value)).ToArray()),
                             new DBusArrayItem(DBusType.Variant, layout.Item3)
                         }));
                     }

src/Avalonia.FreeDesktop/DBusSystemDialog.cs

@@ -88,7 +88,7 @@ public override async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(File
             if (options.SuggestedFileName is { } currentName)
                 chooserOptions.Add("current_name", new DBusVariantItem("s", new DBusStringItem(currentName)));
             if (options.SuggestedStartLocation?.TryGetLocalPath()  is { } folderPath)
-                chooserOptions.Add("current_folder", new DBusVariantItem("ay", new DBusArrayItem(DBusType.Byte, Encoding.UTF8.GetBytes(folderPath).Select(static x => new DBusByteItem(x)))));
+                chooserOptions.Add("current_folder", new DBusVariantItem("ay", new DBusByteArrayItem(Encoding.UTF8.GetBytes(folderPath))));
 
             objectPath = await _fileChooser.SaveFileAsync(parentWindow, options.Title ?? string.Empty, chooserOptions);
             var request = new OrgFreedesktopPortalRequest(_connection, "org.freedesktop.portal.Desktop", objectPath);
@@ -149,7 +149,7 @@ public override async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(
             if (fileTypes is null)
                 return null;
 
-            var filters = new DBusArrayItem(DBusType.Struct, new List<DBusItem>());
+            var filters = new List<DBusItem>();
 
             foreach (var fileType in fileTypes)
             {
@@ -173,7 +173,7 @@ public override async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(
                     }));
             }
 
-            return filters.Count > 0 ? new DBusVariantItem("a(sa(us))", filters) : null;
+            return filters.Count > 0 ? new DBusVariantItem("a(sa(us))", new DBusArrayItem(DBusType.Struct, filters)) : null;
         }
     }
 }