settings: Tweak priorities for keyfile backend

We want to use the keyfile backend in sandboxes,
but we want to avoid people losing their existing
settings that are stored in dconf. Flatpak does
a migration from dconf to keyfile, but only if
the app explictly requests it.

From an app perspective, there are two steps to
the dconf->keyfile migration:
1. Request that flatpak do the migration, by adding
   the migrate-path key to the metadata
2. Stop adding the 'dconf hole' to the sandbox

To keep us from switching to the keyfile backend
prematurely, look at whether the app has stopped
requesting a 'dconf hole' in the sandbox.
This commit is contained in:
Matthias Clasen 2019-07-12 11:31:37 -04:00 committed by Philip Withnall
parent 9c5d3a6081
commit addb8c158a

View File

@ -80,7 +80,7 @@ typedef struct
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#define EXTENSION_PRIORITY 10 #define EXTENSION_PRIORITY 10
#else #else
#define EXTENSION_PRIORITY (glib_should_use_portal () ? 110 : 10) #define EXTENSION_PRIORITY (glib_should_use_portal () && !glib_has_dconf_access_in_sandbox () ? 110 : 10)
#endif #endif
G_DEFINE_TYPE_WITH_CODE (GKeyfileSettingsBackend, G_DEFINE_TYPE_WITH_CODE (GKeyfileSettingsBackend,