diff options
| author | Ondrej Holy <oholy@redhat.com> | 2022-02-11 14:25:26 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2022-02-11 14:59:48 +0100 |
| commit | e2727f840b2441686c52b2dae46e05cd8da2c84e (patch) | |
| tree | f0378163390a30fbe67d92987ff649a98e158d6d | |
| parent | 7f343d0f3a2dbf5ad24f071fe5d8c57612f440ff (diff) | |
| download | nautilus-e2727f840b2441686c52b2dae46e05cd8da2c84e.tar.gz | |
Revert "general: Stop using GEmblemedIcon"
This reverts commit 3c977dcf51bdaaa23258a5da8f19a9c1a9ca2d6d.
| -rw-r--r-- | src/nautilus-bookmark.c | 5 | ||||
| -rw-r--r-- | src/nautilus-file.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/nautilus-bookmark.c b/src/nautilus-bookmark.c index ba56a97e5..bc3c3bea7 100644 --- a/src/nautilus-bookmark.c +++ b/src/nautilus-bookmark.c @@ -172,7 +172,6 @@ static void apply_warning_emblem (GIcon **base, gboolean symbolic) { -#if 0 && EMBLEMS_NEEDS_GTK4_REIMPLEMENTATION GIcon *emblemed_icon; g_autoptr (GIcon) warning = NULL; g_autoptr (GEmblem) emblem = NULL; @@ -192,10 +191,6 @@ apply_warning_emblem (GIcon **base, g_object_unref (*base); *base = emblemed_icon; -#else - /* GTK 4 doesn't draw emblemed icons. Use the warning icon itself. */ - g_set_object (base, g_themed_icon_new (symbolic ? "dialog-warning-symbolic" : "dialog-warning")); -#endif } gboolean diff --git a/src/nautilus-file.c b/src/nautilus-file.c index bd3303d7e..4253642da 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -4966,7 +4966,6 @@ nautilus_file_get_keywords (NautilusFile *file) return sort_keyword_list_and_remove_duplicates (keywords); } -#if 0 && EMBLEMS_NEEDS_GTK4_REIMPLEMENTATION /** * nautilus_file_get_emblem_icons * @@ -5019,7 +5018,6 @@ nautilus_file_get_emblem_icons (NautilusFile *file) return icons; } -#endif static void prepend_icon_name (const char *name, @@ -5033,9 +5031,7 @@ apply_emblems_to_icon (NautilusFile *file, GIcon **icon, NautilusFileIconFlags flags) { -#if 0 && EMBLEMS_NEEDS_GTK4_REIMPLEMENTATION GIcon *emblemed_icon = NULL; - g_autolist (GIcon) emblems = NULL; emblems = nautilus_file_get_emblem_icons (file); @@ -5072,7 +5068,6 @@ apply_emblems_to_icon (NautilusFile *file, g_object_unref (*icon); *icon = emblemed_icon; } -#endif } GIcon * |