diff options
| author | Martin Stransky <stransky@redhat.com> | 2019-11-26 11:08:35 +0100 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2019-11-26 11:08:35 +0100 |
| commit | 52405647049f7e1aa421752dcf1beb326978593b (patch) | |
| tree | c0ea961790d87321e590438be96675757d087e7b /mozilla-1548475.patch | |
| parent | Merge branch 'master' into f30 (diff) | |
| parent | Updated to 71.0 Build 2 (diff) | |
| download | librewolf-fedora-ff-52405647049f7e1aa421752dcf1beb326978593b.tar.gz librewolf-fedora-ff-52405647049f7e1aa421752dcf1beb326978593b.tar.bz2 librewolf-fedora-ff-52405647049f7e1aa421752dcf1beb326978593b.zip | |
Merge branch 'master' into f30
Diffstat (limited to 'mozilla-1548475.patch')
| -rw-r--r-- | mozilla-1548475.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/mozilla-1548475.patch b/mozilla-1548475.patch deleted file mode 100644 index b325683..0000000 --- a/mozilla-1548475.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp ---- a/dom/plugins/base/nsPluginHost.cpp -+++ b/dom/plugins/base/nsPluginHost.cpp -@@ -105,6 +105,10 @@ - # include "windows.h" - # include "winbase.h" - #endif -+#if (MOZ_WIDGET_GTK) -+# include <gdk/gdk.h> -+# include <gdk/gdkx.h> -+#endif - - #include "npapi.h" - -@@ -358,9 +362,15 @@ - mOverrideInternalTypes = - Preferences::GetBool("plugin.override_internal_types", false); - -- mPluginsDisabled = Preferences::GetBool("plugin.disable", false); -- -- Preferences::AddStrongObserver(this, "plugin.disable"); -+ bool waylandBackend = false; -+#if MOZ_WIDGET_GTK -+ waylandBackend = !GDK_IS_X11_DISPLAY(gdk_display_get_default()); -+#endif -+ mPluginsDisabled = -+ Preferences::GetBool("plugin.disable", false) || waylandBackend; -+ if (!waylandBackend) { -+ Preferences::AddStrongObserver(this, "plugin.disable"); -+ } - - nsCOMPtr<nsIObserverService> obsService = - mozilla::services::GetObserverService(); - |