luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 11:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'keyfile-portal-fixes' into 'master'

Browse Source 
Keyfile portal fixes

See merge request GNOME/glib!985
This commit is contained in:
Philip Withnall 2019-07-15 12:32:01 +00:00
commit 493b8ca021
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gkeyfilesettingsbackend.c
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,

18
gio/gportalsupport.c
View File

@ -23,6 +23,7 @@
static gboolean flatpak_info_read; static gboolean flatpak_info_read;
static gboolean use_portal; static gboolean use_portal;
static gboolean network_available; static gboolean network_available;
static gboolean dconf_access;
static void static void
read_flatpak_info (void) read_flatpak_info (void)
@ -40,11 +41,13 @@ read_flatpak_info (void)
use_portal = TRUE; use_portal = TRUE;
network_available = FALSE; network_available = FALSE;
dconf_access = FALSE;
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
if (g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL)) if (g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL))
{ {
char **shared = NULL; char **shared = NULL;
char *dconf_policy = NULL;
shared = g_key_file_get_string_list (keyfile, "Context", "shared", NULL, NULL); shared = g_key_file_get_string_list (keyfile, "Context", "shared", NULL, NULL);
if (shared) if (shared)
@ -52,6 +55,14 @@ read_flatpak_info (void)
network_available = g_strv_contains ((const char * const *)shared, "network"); network_available = g_strv_contains ((const char * const *)shared, "network");
g_strfreev (shared); g_strfreev (shared);
} }
dconf_policy = g_key_file_get_string (keyfile, "Session Bus Policy", "ca.desrt.dconf", NULL);
if (dconf_policy)
{
if (strcmp (dconf_policy, "talk") == 0)
dconf_access = TRUE;
g_free (dconf_policy);
}
} }
g_key_file_unref (keyfile); g_key_file_unref (keyfile);
@ -64,6 +75,7 @@ read_flatpak_info (void)
if (var && var[0] == '1') if (var && var[0] == '1')
use_portal = TRUE; use_portal = TRUE;
network_available = TRUE; network_available = TRUE;
dconf_access = TRUE;
} }
} }
@ -81,3 +93,9 @@ glib_network_available_in_sandbox (void)
return network_available; return network_available;
} }
gboolean
glib_has_dconf_access_in_sandbox (void)
{
read_flatpak_info ();
return dconf_access;
}

1
gio/gportalsupport.h
View File

@ -24,6 +24,7 @@ G_BEGIN_DECLS
gboolean glib_should_use_portal (void); gboolean glib_should_use_portal (void);
gboolean glib_network_available_in_sandbox (void); gboolean glib_network_available_in_sandbox (void);
gboolean glib_has_dconf_access_in_sandbox (void);
G_END_DECLS G_END_DECLS