From 0b0964887c815e9731e54d0d7c63fc99c4c5871d Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Mon, 1 Feb 2021 13:56:22 +0100 Subject: fix a badly merged patch --- deb_patches/silence-gtk-style-assertions.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/deb_patches/silence-gtk-style-assertions.patch b/deb_patches/silence-gtk-style-assertions.patch index 71cf2aa..b63a658 100644 --- a/deb_patches/silence-gtk-style-assertions.patch +++ b/deb_patches/silence-gtk-style-assertions.patch @@ -13,21 +13,6 @@ Author: Olivier Tilloy if (mTextSelectedBackground == mTextSelectedText) { // Some old distros/themes don't properly use the .selection style, so // fall back to the regular text view style. -@@ -13,6 +13,14 @@ - if (mTextSelectedBackground == mTextSelectedText) { - // Some old distros/themes don't properly use the .selection style, so - // fall back to the regular text view style. -+@@ -1413,6 +1413,7 @@ bool nsLookAndFeel::WidgetUsesImage(Widg -+ GTK_STATE_FLAG_BACKDROP, GTK_STATE_FLAG_INSENSITIVE}; -+ -+ GtkStyleContext* style = GetStyleContext(aNodeType); -++ if (!style) return false; -+ -+ GValue value = G_VALUE_INIT; -+ for (GtkStateFlags state : sFlagsToCheck) { - --- a/widget/gtk/WidgetStyleCache.cpp - +++ b/widget/gtk/WidgetStyleCache.cpp - @@ -933,7 +933,7 @@ static GtkStyleContext* GetWidgetRootSty @@ -1413,6 +1413,7 @@ bool nsLookAndFeel::WidgetUsesImage(Widg }; -- cgit