[nautilus/wip/antoniof/gnome-42: 53/72] Revert "general: Stop using GEmblemedIcon"
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/antoniof/gnome-42: 53/72] Revert "general: Stop using GEmblemedIcon"
- Date: Fri, 11 Feb 2022 19:28:01 +0000 (UTC)
commit 3158681a189ce54cc7fe1eef988107be081765c3
Author: Ondrej Holy <oholy redhat com>
Date: Fri Feb 11 14:25:26 2022 +0100
Revert "general: Stop using GEmblemedIcon"
This reverts commit 3c977dcf51bdaaa23258a5da8f19a9c1a9ca2d6d.
src/nautilus-bookmark.c | 5 -----
src/nautilus-file.c | 5 -----
2 files changed, 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 8dda72e10..ca5a5cc1b 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -4967,7 +4967,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
*
@@ -5020,7 +5019,6 @@ nautilus_file_get_emblem_icons (NautilusFile *file)
return icons;
}
-#endif
static void
prepend_icon_name (const char *name,
@@ -5034,9 +5032,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);
@@ -5073,7 +5069,6 @@ apply_emblems_to_icon (NautilusFile *file,
g_object_unref (*icon);
*icon = emblemed_icon;
}
-#endif
}
GIcon *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]