diff options
| author | raveit65 <[email protected]> | 2020-01-03 18:02:35 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2020-01-12 13:11:13 +0100 |
| commit | 13d04135dda574bbaa51f56df1783778f423e0f2 (patch) | |
| tree | d932df097a5928a3986aa5468d795f92e3ecffd1 | |
| parent | 3a1b4a58792dfc4d954546c044338f5e6f8f9c9b (diff) | |
| download | caja-13d04135dda574bbaa51f56df1783778f423e0f2.tar.bz2 caja-13d04135dda574bbaa51f56df1783778f423e0f2.tar.xz | |
fm-properties: Remove use of mate-desktop-thumbnail helper
don't use mate_desktop_thumbnail_scale_down_pixbuf().
gdk-pixbuf doesn't have the same bugs when shrinking images by large
factors.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/file-manager/fm-properties-window.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b834f880..9f13a692 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ AC_PREREQ(2.54) dnl =========================================================================== +m4_define(gdk-pixbuf_minver, 2.36.5) m4_define(glib_minver, 2.58.1) m4_define(gio_minver, 2.50.0) m4_define(mate_desktop_minver, 1.17.3) @@ -33,6 +34,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"]) +AC_SUBST(GDKPIXBUF_REQUIRED, [gdk-pixbuf_minver]) AC_SUBST(GLIB_REQUIRED, [glib_minver]) AC_SUBST(GIO_REQUIRED, [gio_minver]) AC_SUBST(MATE_DESKTOP_REQUIRED, [mate_desktop_minver]) @@ -64,6 +66,7 @@ AC_PATH_PROG([GLA11Y], [gla11y], [true]) AC_CHECK_LIB(m, floor) PKG_CHECK_MODULES(ALL, [ + gdk-pixbuf-2.0 >= gdk-pixbuf_minver glib-2.0 >= glib_minver mate-desktop-2.0 >= mate_desktop_minver gthread-2.0 diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index e5b820b7..2ccc92f6 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -31,9 +31,6 @@ #include <glib/gi18n.h> #include <sys/stat.h> -#define MATE_DESKTOP_USE_UNSTABLE_API -#include <libmate-desktop/mate-desktop-thumbnail.h> - #include <eel/eel-accessibility.h> #include <eel/eel-gdk-pixbuf-extensions.h> #include <eel/eel-glib-extensions.h> @@ -5677,10 +5674,11 @@ update_preview_callback (GtkFileChooser *icon_chooser, scale = (double)gdk_pixbuf_get_height (pixbuf) / gdk_pixbuf_get_width (pixbuf); - scaled_pixbuf = mate_desktop_thumbnail_scale_down_pixbuf + scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf, PREVIEW_IMAGE_WIDTH, - scale * PREVIEW_IMAGE_WIDTH); + scale * PREVIEW_IMAGE_WIDTH, + GDK_INTERP_HYPER); g_object_unref (pixbuf); pixbuf = scaled_pixbuf; } |