From b6ec43aaf0ff2e001d4f31dff5142c8dc271483b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
Date: Tue, 2 Nov 2021 21:57:50 +0000
Subject: [PATCH] general: Remove thumbnail frame

Shadows are present in design mockups, frame is not.

In GTK 4 we are going to be able to draw shadows in the new views using
CSS, which is going to be much better than transforming pixbufs.

Furthermore, this removes another use of libgd, which we want to stop
depending on as part of the GTK 3-to-4 migration.
---
 icons/thumbnail_frame.png            | Bin 482 -> 0 bytes
 src/nautilus-file.c                  |   4 ----
 src/nautilus-ui-utilities.c          |  25 -------------------------
 src/nautilus-ui-utilities.h          |   1 -
 src/resources/nautilus.gresource.xml |   1 -
 5 files changed, 31 deletions(-)
 delete mode 100644 icons/thumbnail_frame.png

diff --git a/icons/thumbnail_frame.png b/icons/thumbnail_frame.png
deleted file mode 100644
index 674b648bcd62488c4973a9e41bd70f8dcd77f695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 482
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$m7#JAiJzX3_
zD(1YMZJl*EK*05Rr{E!Zot0PEa`u>n$2DDlaH{%*Qw*z<R&xG<rFK7>FE+%meo{;=
zQJ8i4oc1}}zudq7o_<j@dyPro^|Y`P3;|a+Z+%;4weQ^*pjg`GoXs=z-6LmR&f6Ps
zHMP)2*34H~C{t#AyGfjjig$73nd!>CkGIZ>{Al>^V@1aGQpRt;gPk~HC#g(Zx^qUP
zV6EN1?;n-y&E59f%5cdwh%NZYu!W(QeF1BR4TG-3W5x_dDSij;3l$7e4ab--FqzOm
z$vzei#gZu=@iq5Xtg2e~YSW2JF_Tmbz1HNf+9eWd>waz9?Z+<**1wum_NsT4-qQ-J
rJ8N^dTgk?k`zn9>_Rs3X`_KMj7vfEg47uZh@xkEf>gTe~DWM4f#!S0&

diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 3f5d1399c..9498e81e4 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -5261,10 +5261,6 @@ nautilus_file_get_thumbnail_icon (NautilusFile          *file,
                     {
                         nautilus_ui_frame_video (&pixbuf);
                     }
-                    else
-                    {
-                        nautilus_ui_frame_image (&pixbuf);
-                    }
                 }
             }
 
diff --git a/src/nautilus-ui-utilities.c b/src/nautilus-ui-utilities.c
index 195f765f9..79a624a14 100644
--- a/src/nautilus-ui-utilities.c
+++ b/src/nautilus-ui-utilities.c
@@ -28,7 +28,6 @@
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#include <libgd/gd.h>
 #include <string.h>
 #include <glib/gi18n.h>
 
@@ -68,30 +67,6 @@ nautilus_gmenu_set_from_model (GMenu      *target_menu,
     }
 }
 
-#define NAUTILUS_THUMBNAIL_FRAME_LEFT 3
-#define NAUTILUS_THUMBNAIL_FRAME_TOP 3
-#define NAUTILUS_THUMBNAIL_FRAME_RIGHT 3
-#define NAUTILUS_THUMBNAIL_FRAME_BOTTOM 3
-
-void
-nautilus_ui_frame_image (GdkPixbuf **pixbuf)
-{
-    GtkBorder border;
-    GdkPixbuf *pixbuf_with_frame;
-
-    border.left = NAUTILUS_THUMBNAIL_FRAME_LEFT;
-    border.top = NAUTILUS_THUMBNAIL_FRAME_TOP;
-    border.right = NAUTILUS_THUMBNAIL_FRAME_RIGHT;
-    border.bottom = NAUTILUS_THUMBNAIL_FRAME_BOTTOM;
-
-    pixbuf_with_frame = gd_embed_image_in_frame (*pixbuf,
-                                                 "resource:///org/gnome/nautilus/icons/thumbnail_frame.png",
-                                                 &border, &border);
-    g_object_unref (*pixbuf);
-
-    *pixbuf = pixbuf_with_frame;
-}
-
 static GdkPixbuf *filmholes_left = NULL;
 static GdkPixbuf *filmholes_right = NULL;
 
diff --git a/src/nautilus-ui-utilities.h b/src/nautilus-ui-utilities.h
index 1136e1de6..ed00f5fc7 100644
--- a/src/nautilus-ui-utilities.h
+++ b/src/nautilus-ui-utilities.h
@@ -28,7 +28,6 @@
 void        nautilus_gmenu_set_from_model           (GMenu             *target_menu,
                                                      GMenuModel        *source_model);
 
-void        nautilus_ui_frame_image                 (GdkPixbuf        **pixbuf);
 void        nautilus_ui_frame_video                 (GdkPixbuf        **pixbuf);
 
 gboolean    nautilus_file_date_in_between           (guint64            file_unix_time,
diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml
index a0cd28876..ccb2ef6ff 100644
--- a/src/resources/nautilus.gresource.xml
+++ b/src/resources/nautilus.gresource.xml
@@ -28,7 +28,6 @@
     <file>ui/nautilus-operations-ui-manager-request-passphrase.ui</file>
     <file alias="gtk/ui/nautilusgtkplacesview.ui">../gtk/nautilusgtkplacesview.ui</file>
     <file alias="gtk/ui/nautilusgtkplacesviewrow.ui">../gtk/nautilusgtkplacesviewrow.ui</file>
-    <file alias="icons/thumbnail_frame.png">../../icons/thumbnail_frame.png</file>
     <file alias="icons/filmholes.png">../../icons/filmholes.png</file>
     <file>css/Adwaita.css</file>
     <file>css/nautilus.css</file>