rebase after patches

comm-central/patches/9999999-newmail-icon-suite.patch

@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1657196785 0
-Bug 9999999 - Restore newmail.ico whch was removed by Bug 1773772.
-
-diff --git a/suite/app/splash.rc b/suite/app/splash.rc
---- a/suite/app/splash.rc
-+++ b/suite/app/splash.rc
-@@ -12,12 +12,12 @@ BEGIN
-   IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@"
- END
- 
- // Program icon.
- IDI_APPLICATION ICON SEAMONKEY_ICO
- 
- // For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
- #define IDI_MAILBIFF 32576
--IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
-+IDI_MAILBIFF  ICON  "../branding/seamonkey/icons/windows/newmail.ico"
- 
- #define IDI_HTMLFILE 32577
- IDI_HTMLFILE ICON HTML_FILE_ICO
-diff --git a/suite/branding/seamonkey/icons/windows/newmail.ico b/suite/branding/seamonkey/icons/windows/newmail.ico
-new file mode 100644
-index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..301c0853eed2cf5c1e5a9011aca3d83c08037b06
-GIT binary patch
-literal 318
-zc${^QI}XDj5JZP4lGEWTZLF=*afDpSo#{-6J70+-AsSOe+U#OSiWGT2JQxr#fRXI`
-z9vV*r+?CR*4AKVIwwG`gp%p^dp(&G;l28?H1?C-^D(P@Ux5|p^XuUFKyNOWeY}rp!
-zWMN&FRT-JRu+Bu=nr$quIG=AbG1C@0cFcuGfLtNH`OAwdLwkzo_vhx+)W1tPn=Mcu
-J!28wg-~+>oRUZHV
-

comm-central/patches/9999999-port1772006-suite-bustage.patch

@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1659277095 0
-Bug 9999999 - Port bug 1772006 to suite.
-Bug 1772006 - Clean up nsString implementation source files.
-
-diff --git a/suite/components/shell/nsWindowsShellService.cpp b/suite/components/shell/nsWindowsShellService.cpp
---- a/suite/components/shell/nsWindowsShellService.cpp
-+++ b/suite/components/shell/nsWindowsShellService.cpp
-@@ -357,20 +357,20 @@ nsWindowsShellService::TestForDefault(SE
-   wchar_t currValue[MAX_BUF];
-   SETTING* end = aSettings + aSize;
-   for (SETTING * settings = aSettings; settings < end; ++settings) {
-     NS_ConvertUTF8toUTF16 dataLongPath(settings->valueData);
-     NS_ConvertUTF8toUTF16 dataShortPath(settings->valueData);
-     NS_ConvertUTF8toUTF16 key(settings->keyName);
-     NS_ConvertUTF8toUTF16 value(settings->valueName);
-     if (settings->flags & APP_PATH_SUBSTITUTION) {
--      int32_t offset = dataLongPath.Find("%APPPATH%");
-+      int32_t offset = dataLongPath.Find(u"%APPPATH%");
-       dataLongPath.Replace(offset, 9, mAppLongPath);
-       // Remove the quotes around %APPPATH% in VAL_OPEN for short paths
--      int32_t offsetQuoted = dataShortPath.Find("\"%APPPATH%\"");
-+      int32_t offsetQuoted = dataShortPath.Find(u"\"%APPPATH%\"");
-       if (offsetQuoted != -1)
-         dataShortPath.Replace(offsetQuoted, 11, mAppShortPath);
-       else
-         dataShortPath.Replace(offset, 9, mAppShortPath);
-     }
- 
-     ::ZeroMemory(currValue, sizeof(currValue));
-     HKEY theKey;

comm-central/patches/series

@@ -1,5 +1,3 @@
-9999999-newmail-icon-suite.patch
-9999999-port1772006-suite-bustage.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch