luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-984-985-keyfile-portal-fixes-glib-2-60' into 'glib-2-60'

Browse Source 
Backport !984, !985 keyfile/portal fixes to glib-2-60

See merge request GNOME/glib!993
This commit is contained in:
Matthias Clasen
2019-07-15 14:15:37 +00:00
parent cffe8efd0a 715c8670ae
commit 0c149089ca
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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,
@@ -740,7 +740,8 @@ g_keyfile_settings_backend_set_property (GObject *object,
case PROP_FILENAME: case PROP_FILENAME:
/* Construct only. */ /* Construct only. */
g_assert (kfsb->file == NULL); g_assert (kfsb->file == NULL);
kfsb->file = g_file_new_for_path (g_value_get_string (value)); if (g_value_get_string (value))
kfsb->file = g_file_new_for_path (g_value_get_string (value));
break; break;
case PROP_ROOT_PATH: case PROP_ROOT_PATH:

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