[rpms/firefox] f44: Disabled session restore on Gnome

[rpms/firefox] f44: Disabled session restore on Gnome

[Martin Stransky]

A new commit has been pushed.

Repo   : rpms/firefox
Branch : f44
Commit : 35ab901cbc2b57d80a5397bab681074c4ab74ca7
Author : Martin Stransky <stransky@redhat.com>
Date   : 2026-09-17T14:00:19+02:00
Stats  : +106/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/firefox/c/35ab901cbc2b57d80a5397bab681074c4ab74ca7?branch=f44

Log:
Disabled session restore on Gnome

---
diff --git a/D326840.1789732703.diff b/D326840.1789732703.diff
new file mode 100644
index 0000000..499c25d
--- /dev/null
+++ b/D326840.1789732703.diff
@@ -0,0 +1,100 @@
+diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
+--- a/widget/gtk/nsWindow.h
++++ b/widget/gtk/nsWindow.h
+@@ -199,12 +199,10 @@
+   bool IsEnabled() const override;
+ 
+   nsSizeMode GetSizeMode() const { return mSizeMode; }
+   nsSizeMode SizeMode() override { return mSizeMode; }
+   void SetSizeMode(nsSizeMode aMode) override;
+-  void GetWorkspaceID(nsAString& workspaceID) override;
+-  void MoveToWorkspace(const nsAString& workspaceID) override;
+   void Enable(bool aState) override;
+   void SetFocus(Raise, mozilla::dom::CallerType aCallerType) override;
+   LayoutDeviceIntRect GetBounds() override;
+   LayoutDeviceIntRect GetScreenBounds() override;
+   DesktopIntRect GetScreenBoundsUnscaled();
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -1202,18 +1202,10 @@
+ 
+   const auto& desktop = GetDesktopEnvironmentIdentifier();
+   return desktop.EqualsLiteral("bspwm") || desktop.EqualsLiteral("i3");
+ }
+ 
+-void nsWindow::GetWorkspaceID(nsAString& workspaceID) {
+-  workspaceID.Truncate();
+-}
+-
+-void nsWindow::MoveToWorkspace(const nsAString& workspaceIDStr) {
+-  LOG("  MoveToWorkspace disabled, quit");
+-}
+-
+ void nsWindow::SetUserTimeAndStartupTokenForActivatedWindow() {
+   nsGTKToolkit* toolkit = nsGTKToolkit::GetToolkit();
+   if (!toolkit) {
+     return;
+   }
+diff --git a/widget/gtk/nsWindowWayland.h b/widget/gtk/nsWindowWayland.h
+--- a/widget/gtk/nsWindowWayland.h
++++ b/widget/gtk/nsWindowWayland.h
+@@ -14,12 +14,12 @@
+   nsWindowWayland();
+ 
+   nsWindowWayland* AsWayland() override { return this; }
+   nsWindow* GetEffectiveParent() const;
+ 
+-  void GetWorkspaceID(nsAString& workspaceID) override;
+-  void MoveToWorkspace(const nsAString& workspaceIDStr) override;
++  void GetWorkspaceID(nsAString& aWorkspaceID) override;
++  void MoveToWorkspace(const nsAString& aWorkspaceIDStr) override;
+   void RestoreXdgToplevel();
+ 
+   // Use xdg-activation protocol to transfer focus from gFocusWindow.
+   void TransferFocusTo();
+   void FocusWaylandWindow(const char* aTokenID);
+diff --git a/widget/gtk/nsWindowWayland.cpp b/widget/gtk/nsWindowWayland.cpp
+--- a/widget/gtk/nsWindowWayland.cpp
++++ b/widget/gtk/nsWindowWayland.cpp
+@@ -116,15 +116,19 @@
+   LOG("nsWindowWayland::CreateRestoreSession() ID %s restore %d token %p",
+       mWorkspaceID.get(), aRestoreWindow, mSessionRestoreToken);
+   return !!mSessionRestoreToken;
+ }
+ 
+-void nsWindowWayland::GetWorkspaceID(nsAString& workspaceID) {
++void nsWindowWayland::GetWorkspaceID(nsAString& aWorkspaceID) {
++  if (!nsAppShell::IsSessionRestoreSupported()) {
++    aWorkspaceID.Truncate();
++    return;
++  }
+   if (mWorkspaceID.IsEmpty()) {
+     mWorkspaceID = GenerateWorkspaceID();
+   }
+-  workspaceID = NS_ConvertUTF8toUTF16(mWorkspaceID);
++  aWorkspaceID = NS_ConvertUTF8toUTF16(mWorkspaceID);
+ 
+   LOG("nsWindowWayland::GetWorkspaceID() ID %s token %p", mWorkspaceID.get(),
+       mSessionRestoreToken);
+ 
+   if (mSessionRestoreToken) {
+@@ -156,12 +160,15 @@
+     }
+ #endif
+   }
+ }
+ 
+-void nsWindowWayland::MoveToWorkspace(const nsAString& workspaceIDStr) {
+-  mWorkspaceID = NS_ConvertUTF16toUTF8(workspaceIDStr);
++void nsWindowWayland::MoveToWorkspace(const nsAString& aWorkspaceIDStr) {
++  if (!nsAppShell::IsSessionRestoreSupported()) {
++    return;
++  }
++  mWorkspaceID = NS_ConvertUTF16toUTF8(aWorkspaceIDStr);
+   LOG("nsWindowWayland::MoveToWorkspace() session ID %s "
+       "mWaitingToSessionRestore %d mNeedsShow %d",
+       mWorkspaceID.get(), mWaitingToSessionRestore, mNeedsShow);
+   if (!mWaitingToSessionRestore) {
+     return;
+

diff --git a/firefox.spec b/firefox.spec
index 5c5bd76..87b00a2 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -190,7 +190,7 @@ ExcludeArch: i686
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        156.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 # Automatically converted from old format: MPLv1.1 or GPLv2+ or LGPLv2+ - review is highly recommended.
 License:        LicenseRef-Callaway-MPLv1.1 OR GPL-2.0-or-later OR LicenseRef-Callaway-LGPLv2+
@@ -263,6 +263,7 @@ Patch402:        D324870.1789116963.diff
 Patch403:        D324871.1789116972.diff
 Patch404:        D324876.1789116899.diff
 Patch405:        D324877.1789117000.diff
+Patch406:        D326840.1789732703.diff
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -551,6 +552,7 @@ cat %{SOURCE49} | sed -e "s|LIBCLANG_RT_PLACEHOLDER|`pwd`/wasi-sdk-30/build/sysr
 %patch -P403 -p1 -b .D324871
 %patch -P404 -p1 -b .D324876
 %patch -P405 -p1 -b .D324877
+%patch -P406 -p1 -b .D326840
 
 # PGO patches
 %if %{build_with_pgo}
@@ -1206,6 +1208,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Sep 17 2026 Martin Stransky <stransky@redhat.com> - 156.0-2
+- Disabled session restore on Gnome.
+
 * Thu Sep 10 2026 Martin Stransky <stransky@redhat.com> - 156.0-1
 - Updated to 156.0
 - Enabled session restore on KDE