mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed wayland clipboard registration, retry if seat is detected before.

This commit is contained in:
Armin Novak 2019-01-24 13:15:40 +01:00
parent 86e20d7647
commit 0fd27e0e38
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
uwac/libuwac/uwac-clipboard.c
View File

@ -150,6 +150,9 @@ UwacReturnCode UwacSeatRegisterClipboard(UwacSeat* s)
if (!s)
return UWAC_ERROR_INTERNAL;
if (!s->display->data_device_manager || !s->data_device)
return UWAC_NOT_ENOUGH_RESOURCES;
UwacRegisterDeviceListener(s);
rc = UwacCreateDataSource(s);

4
uwac/libuwac/uwac-display.c
View File

@ -147,7 +147,8 @@ static void UwacSeatRegisterDDM(UwacSeat *seat)
if (!d->data_device_manager)
return;
seat->data_device = wl_data_device_manager_get_data_device(d->data_device_manager, seat->seat);
if (!seat->data_device)
seat->data_device = wl_data_device_manager_get_data_device(d->data_device_manager, seat->seat);
}
static void registry_handle_global(void* data, struct wl_registry* registry, uint32_t id,
@ -222,6 +223,7 @@ static void registry_handle_global(void* data, struct wl_registry* registry, uin
wl_list_for_each(seat, &d->seats, link)
{
UwacSeatRegisterDDM(seat);
UwacSeatRegisterClipboard(seat);
}
}
else if (strcmp(interface, "wl_shell") == 0)