mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-14 06:59:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-portal: Ignore if pipewire.access.portal.is_portal is "yes"

Browse source 
This is for the remotes that the portal itself owns, such as ones that
track the number of cameras.
This commit is contained in:
Jonas Ådahl 2019-05-20 12:29:14 +02:00 • committed by Wim Taymans
parent abaf40ba8b
commit 55eadd6c4c
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/module-portal.c
View file

@ -71,6 +71,7 @@ struct client_info {
bool portal_managed; bool portal_managed;
bool setup_complete; bool setup_complete;
bool is_portal;
char *app_id; char *app_id;
enum media_role media_roles; enum media_role media_roles;
enum media_role allowed_media_roles; enum media_role allowed_media_roles;
@ -381,6 +382,7 @@ static void client_info_changed(void *data, struct pw_client_info *info)
{ {
struct client_info *cinfo = data; struct client_info *cinfo = data;
const struct pw_properties *properties; const struct pw_properties *properties;
const char *is_portal;
const char *app_id; const char *app_id;
const char *media_roles; const char *media_roles;
@ -399,6 +401,16 @@ static void client_info_changed(void *data, struct pw_client_info *info)
pw_log_error("Portal managed client didn't have any properties"); pw_log_error("Portal managed client didn't have any properties");
return; return;
} }
is_portal = pw_properties_get(properties,
"pipewire.access.portal.is_portal");
if (is_portal != NULL && strcmp(is_portal, "yes") == 0) {
pw_log_debug("module %p: client %p is the portal itself",
cinfo->impl, cinfo->client);
cinfo->is_portal = true;
return;
};
app_id = pw_properties_get(properties, app_id = pw_properties_get(properties,
"pipewire.access.portal.app_id"); "pipewire.access.portal.app_id");
if (app_id == NULL) { if (app_id == NULL) {
@ -446,7 +458,8 @@ core_global_added(void *data, struct pw_global *global)
} }
else { else {
spa_list_for_each(cinfo, &impl->client_list, link) { spa_list_for_each(cinfo, &impl->client_list, link) {
if (cinfo->portal_managed) if (cinfo->portal_managed &&
!cinfo->is_portal)
set_global_permissions(cinfo, global); set_global_permissions(cinfo, global);
} }
} }
@ -664,6 +677,9 @@ static DBusHandlerResult permission_store_changed_handler(DBusConnection *connec
if (!cinfo->portal_managed) if (!cinfo->portal_managed)
continue; continue;
if (cinfo->is_portal)
continue;
if (strcmp(cinfo->app_id, app_id) != 0) if (strcmp(cinfo->app_id, app_id) != 0)
continue; continue;