[nautilus/wip/antoniof/gtk4-pre-switch-regressions: 4/4] general: Stop using GEmblemedIcon




commit 1857fc78e2523f17415026acb92809e99f030e89
Author: António Fernandes <antoniof gnome org>
Date:   Wed Dec 15 20:06:05 2021 +0000

    general: Stop using GEmblemedIcon
    
    GTK 4 is not going to draw them anyway.
    
    Assume a temporary regression, to be fixed after the switch to GTK 4.

 src/nautilus-bookmark.c | 3 +++
 src/nautilus-file.c     | 3 +++
 2 files changed, 6 insertions(+)
---
diff --git a/src/nautilus-bookmark.c b/src/nautilus-bookmark.c
index f115f2487..247f60ce4 100644
--- a/src/nautilus-bookmark.c
+++ b/src/nautilus-bookmark.c
@@ -193,6 +193,9 @@ apply_warning_emblem (GIcon    **base,
     g_object_unref (*base);
 
     *base = emblemed_icon;
+
+    /* FIXME: GTK 4 doesn't draw emblemed icons. Use the warning icon itself. */
+    *base = g_steal_pointer (&warning);
 }
 
 gboolean
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index d0a9a8d03..34133b167 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -5064,11 +5064,14 @@ apply_emblems_to_icon (NautilusFile           *file,
         }
     }
 
+    /* FIXME: GTK 4 doesn't draw emblemed icons. */
+#if 0
     if (emblemed_icon != NULL)
     {
         g_object_unref (*icon);
         *icon = emblemed_icon;
     }
+#endif
 }
 
 GIcon *


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]