Unverified Commit 12f3bd8a authored by Bobby Rong's avatar Bobby Rong
Browse files

cinnamon.cinnamon-screensaver: Fix broken theming with pygobject 3.46

pygobject!231 ("Fix incompatibility for CssProvider.load_from_data()
(GTK 4.10)") breaks theming here since they eliminated any return value
from GtkCssProvider.load_from_data.
parent ac1a9af0
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
    hash = "sha256-d7h9OJ39HVQNCHNr13M1ybDFoU3Xnd1PEczGLHZU/lU=";
  };

  patches = [
    # See https://github.com/linuxmint/cinnamon-screensaver/issues/446#issuecomment-1819580053
    ./fix-broken-theming-with-pygobject-3-46.patch
  ];

  nativeBuildInputs = [
    pkg-config
    wrapGAppsHook
+17 −0
Original line number Diff line number Diff line
diff --git a/src/cinnamon-screensaver-main.py b/src/cinnamon-screensaver-main.py
index 05b727c..a185159 100755
--- a/src/cinnamon-screensaver-main.py
+++ b/src/cinnamon-screensaver-main.py
@@ -139,9 +139,9 @@ class Main(Gtk.Application):
 
             fallback_prov = Gtk.CssProvider()
 
-            if fallback_prov.load_from_data(fallback_css.encode()):
-                Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default(), fallback_prov, 600)
-                Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default())
+            fallback_prov.load_from_data(fallback_css.encode())
+            Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default(), fallback_prov, 600)
+            Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default())
 
 if __name__ == "__main__":
     setproctitle.setproctitle('cinnamon-screensaver')