Commit 2d6c5864 authored by Debarshi Ray's avatar Debarshi Ray

Replace gnome-desktop with gsettings-desktop-schemas

Since the switch to a custom thumbnailing infrastructure in commit
f8ceb9d2, the only use for gnome-desktop were the
GDesktopBackgroundShading and GDesktopBackgroundStyle enumerated types.
Since those types are actually exported by gsettings-desktop-schemas,
it is better to directly use that instead of a separate intermediary.

This has the nice side-effect of reducing the size of the Flatpak.
parent 00df0938
......@@ -105,13 +105,11 @@ PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0])
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= $GLIB_MIN_VERSION])
PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
PKG_CHECK_MODULES(GNOME_DESKTOP, [gnome-desktop-3.0])
AC_DEFINE([GNOME_DESKTOP_USE_UNSTABLE_API], [], [We are aware that GNOME_DESKTOP's API can change])
PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION])
AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can change])
PKG_CHECK_MODULES(GRILO, [grilo-0.3 >= $GRILO_MIN_VERSION])
PKG_CHECK_MODULES(GSETTINGS_DESKTOP_SCHEMAS, [gsettings-desktop-schemas])
PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_MIN_VERSION])
PKG_CHECK_MODULES(GTK_UNIX_PRINT, [gtk+-unix-print-3.0])
PKG_CHECK_MODULES(PNG, [libpng16])
......
......@@ -180,16 +180,6 @@
}
]
},
{
"name": "gnome-desktop",
"config-opts": [ "--disable-debug-tools", "--disable-udev" ],
"sources": [
{
"type": "git",
"url": "git://git.gnome.org/gnome-desktop"
}
]
},
{
"name": "grilo",
"cleanup": [ "/bin" ],
......
......@@ -398,9 +398,9 @@ AM_CPPFLAGS = \
$(GEXIV2_CFLAGS) \
$(GIO_CFLAGS) \
$(GLIB_CFLAGS) \
$(GNOME_DESKTOP_CFLAGS) \
$(GOA_CFLAGS) \
$(GRILO_CFLAGS) \
$(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS) \
$(GTK_CFLAGS) \
$(GTK_UNIX_PRINT_CFLAGS) \
$(PNG_CFLAGS) \
......@@ -427,7 +427,6 @@ gnome_photos_LDADD = \
$(GEXIV2_LIBS) \
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(GNOME_DESKTOP_LIBS) \
$(GOA_LIBS) \
$(GRILO_LIBS) \
$(GTK_LIBS) \
......
......@@ -29,13 +29,13 @@
#include <stdlib.h>
#include <gdesktop-enums.h>
#include <gegl.h>
#include <gexiv2/gexiv2.h>
#include <gio/gio.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <grilo.h>
#include <libgnome-desktop/gnome-bg.h>
#include "photos-application.h"
#include "photos-base-item.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment