From 1a97c6ce39f19cf30512bd1cce706ac0e1b2455c Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Wed, 29 Sep 2021 20:19:10 +0800
Subject: [PATCH] Revert "Use single connection + new guid per SNI object..."

This reverts commit 19003c0f
---
 src/Avalonia.X11/X11TrayIconImpl.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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