[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:21:44 +0000 (UTC)
commit aa4ffdf54bc22e0c68dbaa0472eec9531270afcb
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 | 21 ++++++++++++++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
---
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..9556bb1 100644
--- a/gnome-flashback/libdesktop/gf-thumbnail-factory.c
+++ b/gnome-flashback/libdesktop/gf-thumbnail-factory.c
@@ -124,14 +124,24 @@ load_icon_in_thread (GTask *task,
pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (data->self->factory,
data->uri,
- data->content_type);
+ data->content_type,
+#ifdef HAVE_GNOME_DESKTOP_43_ALPHA
+ NULL,
+ NULL
+#endif
+ );
if (pixbuf != NULL)
{
gnome_desktop_thumbnail_factory_save_thumbnail (data->self->factory,
pixbuf,
data->uri,
- data->time_modified);
+ data->time_modified,
+#ifdef HAVE_GNOME_DESKTOP_43_ALPHA
+ NULL,
+ NULL
+#endif
+ );
g_task_return_pointer (task, pixbuf, g_object_unref);
return;
@@ -139,7 +149,12 @@ load_icon_in_thread (GTask *task,
gnome_desktop_thumbnail_factory_create_failed_thumbnail (data->self->factory,
data->uri,
- data->time_modified);
+ data->time_modified,
+#ifdef HAVE_GNOME_DESKTOP_43_ALPHA
+ NULL,
+ NULL
+#endif
+ );
g_task_return_new_error (task,
GF_THUMBNAIL_ERROR,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]