Browse Source

Use single connection + new guid per SNI object...

pull/6610/head
Jumar Macato 5 years ago
parent
commit
19003c0f2e
  1. 9
      src/Avalonia.X11/X11TrayIconImpl.cs

9
src/Avalonia.X11/X11TrayIconImpl.cs

@ -38,7 +38,7 @@ namespace Avalonia.X11
public X11TrayIconImpl() public X11TrayIconImpl()
{ {
con = DBusHelper.TryGetConnection(); con = DBusHelper.TryInitialize();
_dbusmenuPath = DBusMenuExporter.GenerateDBusMenuObjPath; _dbusmenuPath = DBusMenuExporter.GenerateDBusMenuObjPath;
MenuExporter = DBusMenuExporter.TryCreateDetachedNativeMenu(_dbusmenuPath, con); MenuExporter = DBusMenuExporter.TryCreateDetachedNativeMenu(_dbusmenuPath, con);
CreateTrayIcon(); CreateTrayIcon();
@ -113,7 +113,7 @@ namespace Avalonia.X11
} }
_icon = new DbusPixmap(w, h, pixByteArray); _icon = new DbusPixmap(w, h, pixByteArray);
_statusNotifierItemDbusObj.SetIcon(_icon); _statusNotifierItemDbusObj?.SetIcon(_icon);
} }
@ -139,7 +139,7 @@ namespace Avalonia.X11
_statusNotifierItemDbusObj?.SetTitleAndTooltip(_tooltipText); _statusNotifierItemDbusObj?.SetTitleAndTooltip(_tooltipText);
} }
} }
/// <summary> /// <summary>
/// DBus Object used for setting system tray icons. /// DBus Object used for setting system tray icons.
/// </summary> /// </summary>
@ -162,7 +162,8 @@ namespace Avalonia.X11
public StatusNotifierItemDbusObj(ObjectPath dbusmenuPath) public StatusNotifierItemDbusObj(ObjectPath dbusmenuPath)
{ {
ObjectPath = new ObjectPath($"/StatusNotifierItem"); var guid = Guid.NewGuid().ToString().Replace("-", "");
ObjectPath = new ObjectPath($"/net/avaloniaui/sni/{guid}");
_backingProperties = new StatusNotifierItemProperties _backingProperties = new StatusNotifierItemProperties
{ {

Loading…
Cancel
Save