Merge branch 'glib-2-58-317-xdg-desktop-portal-autostart' into 'glib-2-58'

Backport “Autostart xdg-desktop-portal if needed” to glib-2-58

See merge request GNOME/glib!321
This commit is contained in:
Iain Lane 2018-09-13 14:19:24 +00:00
commit d89e862f3c
2 changed files with 2 additions and 3 deletions

View File

@ -432,8 +432,7 @@ g_network_monitor_portal_initable_init (GInitable *initable,
}
proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START
| G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL,
"org.freedesktop.portal.Desktop",
"/org/freedesktop/portal/desktop",

View File

@ -52,7 +52,7 @@ ensure_resolver_proxy (GProxyResolverPortal *resolver)
return FALSE;
resolver->resolver = gxdp_proxy_resolver_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
G_DBUS_PROXY_FLAGS_NONE,
"org.freedesktop.portal.Desktop",
"/org/freedesktop/portal/desktop",
NULL,