[gnome-flashback] build: bump required gnome-desktop version
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] build: bump required gnome-desktop version
- Date: Sun, 2 Oct 2022 16:14:22 +0000 (UTC)
commit e4bf1bc7279dab54b57714d090dc71e0f46a5dca
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Oct 2 19:10:37 2022 +0300
build: bump required gnome-desktop version
https://gitlab.gnome.org/GNOME/gnome-flashback/-/issues/83
configure.ac | 11 +----------
gnome-flashback/libdesktop/gf-thumbnail-factory.c | 19 -------------------
2 files changed, 1 insertion(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a1fa637..7ea1900 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ dnl **************************************************************************
GDK_PIXBUF_REQUIRED=2.32.2
GTK_REQUIRED=3.22.0
-LIBGNOME_DESKTOP_REQUIRED=3.12.0
+LIBGNOME_DESKTOP_REQUIRED=43
LIBGNOME_PANEL_REQUIRED=3.35.2
CANBERRA_REQUIRED=0.13
GLIB_REQUIRED=2.67.3
@@ -291,15 +291,6 @@ PKG_CHECK_EXISTS([pango >= 1.44.0],
AC_DEFINE([HAVE_PANGO144], [1],
[Define if Pango is 1.44.0 or newer]))
-dnl **************************************************************************
-dnl Check if we have gnome-desktop 43.alpha or newer
-dnl **************************************************************************
-
-PKG_CHECK_EXISTS([gnome-desktop-3.0 >= 43.alpha],
- AC_DEFINE([HAVE_GNOME_DESKTOP_43_ALPHA], [1],
- [Define if gnome-desktop is 43.alpha or newer]))
-
-
dnl **************************************************************************
dnl Systemd session
dnl **************************************************************************
diff --git a/gnome-flashback/libdesktop/gf-thumbnail-factory.c
b/gnome-flashback/libdesktop/gf-thumbnail-factory.c
index c532e5a..d25f24c 100644
--- a/gnome-flashback/libdesktop/gf-thumbnail-factory.c
+++ b/gnome-flashback/libdesktop/gf-thumbnail-factory.c
@@ -122,49 +122,30 @@ load_icon_in_thread (GTask *task,
return;
}
-#ifdef HAVE_GNOME_DESKTOP_43_ALPHA
pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (data->self->factory,
data->uri,
data->content_type,
NULL,
NULL);
-#else
- pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (data->self->factory,
- data->uri,
- data->content_type);
-#endif
if (pixbuf != NULL)
{
-#ifdef HAVE_GNOME_DESKTOP_43_ALPHA
gnome_desktop_thumbnail_factory_save_thumbnail (data->self->factory,
pixbuf,
data->uri,
data->time_modified,
NULL,
NULL);
-#else
- gnome_desktop_thumbnail_factory_save_thumbnail (data->self->factory,
- pixbuf,
- data->uri,
- data->time_modified);
-#endif
g_task_return_pointer (task, pixbuf, g_object_unref);
return;
}
-#ifdef HAVE_GNOME_DESKTOP_43_ALPHA
gnome_desktop_thumbnail_factory_create_failed_thumbnail (data->self->factory,
data->uri,
data->time_modified,
NULL,
NULL);
-#else
- gnome_desktop_thumbnail_factory_create_failed_thumbnail (data->self->factory,
- data->uri,
- data->time_modified);
-#endif
g_task_return_new_error (task,
GF_THUMBNAIL_ERROR,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]