[gnome-flashback/wip/muktupavels/gnome-desktop-43-alpha] desktop: adapt to gnome-desktop API changes
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback/wip/muktupavels/gnome-desktop-43-alpha] desktop: adapt to gnome-desktop API changes
- Date: Sun, 22 May 2022 19:31:38 +0000 (UTC)
commit d49612cfe0e6b78cfae123038ed5118692803b1c
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun May 22 22:07:05 2022 +0300
desktop: adapt to gnome-desktop API changes
configure.ac | 9 ++++++++
gnome-flashback/libdesktop/gf-thumbnail-factory.c | 25 +++++++++++++++++++++++
2 files changed, 34 insertions(+)
---
diff --git a/configure.ac b/configure.ac
index a19ffa5..4ffd377 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,6 +292,15 @@ 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 df3246b..c532e5a 100644
--- a/gnome-flashback/libdesktop/gf-thumbnail-factory.c
+++ b/gnome-flashback/libdesktop/gf-thumbnail-factory.c
@@ -122,24 +122,49 @@ 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]