From a35520c45b3f627bf86eed3c8359e9d99517acd3 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 27 Oct 2022 15:03:55 +0100
Subject: [PATCH] Revert "Merge branch 'disableSetProcessName-feature' into
 tmp8"

This reverts commit d8ee76d61d42d7a5fa07c548d82e4111e331d5dc.
---
 native/Avalonia.Native/src/OSX/main.mm        | 28 ++++---------------
 src/Avalonia.Native/AvaloniaNativePlatform.cs |  1 -
 .../AvaloniaNativePlatformExtensions.cs       |  2 --
 src/Avalonia.Native/avn.idl                   |  1 -
 4 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
index d9eb29a860..43e4d46c32 100644
--- a/native/Avalonia.Native/src/OSX/main.mm
+++ b/native/Avalonia.Native/src/OSX/main.mm
@@ -3,7 +3,6 @@
 #include "common.h"
 
 static NSString* s_appTitle = @"Avalonia";
-static int disableSetProcessName = 0;
 
 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
@@ -112,17 +111,11 @@ public:
         @autoreleasepool
         {
             auto appTitle = [NSString stringWithUTF8String: utf8String];
-            if (disableSetProcessName == 0)
-            {
-                [[NSProcessInfo processInfo] setProcessName:appTitle];
-                
-                SetProcessName(appTitle);
-            }
-            if (disableSetProcessName == 1)
-            {
-                auto rootMenu = [NSApp mainMenu];
-                [rootMenu setTitle:appTitle];
-            }
+            
+            [[NSProcessInfo processInfo] setProcessName:appTitle];
+            
+            
+            SetProcessName(appTitle);
             
             return S_OK;
         }
@@ -140,17 +133,6 @@ public:
         }
     }
     
-    virtual HRESULT SetDisableSetProcessName(int disable)  override
-    {
-        START_COM_CALL;
-        
-        @autoreleasepool
-        {
-            disableSetProcessName = disable;
-            return S_OK;
-        }
-    }
-    
 };
 
 /// See "Using POSIX Threads in a Cocoa Application" section here:
diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs
index baed66b2b2..d64fde8e17 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs
@@ -98,7 +98,6 @@ namespace Avalonia.Native
                 var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>() ?? new MacOSPlatformOptions();
 
                 _factory.MacOptions.SetShowInDock(macOpts.ShowInDock ? 1 : 0);
-                _factory.MacOptions.SetDisableSetProcessName(macOpts.DisableSetProcessName ? 1 : 0);
             }
 
             AvaloniaLocator.CurrentMutable
diff --git a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
index b38dad55d6..10619d675b 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
@@ -78,7 +78,5 @@ namespace Avalonia
         /// Gets or sets a value indicating whether the native macOS menu bar will be enabled for the application.
         /// </summary>
         public bool DisableNativeMenus { get; set; }
-        
-        public bool DisableSetProcessName { get; set; }
     }
 }
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index 5c8ba3fac7..e02b244db6 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -542,7 +542,6 @@ interface IAvnMacOptions : IUnknown
 {
      HRESULT SetShowInDock(int show);
      HRESULT SetApplicationTitle(char* utf8string);
-     HRESULT SetDisableSetProcessName(int disable);
 }
 
 [uuid(04c1b049-1f43-418a-9159-cae627ec1367)]