motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui/dbus: unregister clipboard on connection close

Browse source 
Fixes unregistration with p2p connections, since they don't have an
associated name owner.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-11-15 16:12:13 +04:00
parent 8bb6af6792
commit b289bb301a
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ui/dbus-clipboard.c
View file

@ -204,15 +204,6 @@ dbus_clipboard_unregister_proxy(DBusDisplay *dpy)
g_clear_object(&dpy->clipboard_proxy); g_clear_object(&dpy->clipboard_proxy);
} }
static void
dbus_on_clipboard_proxy_name_owner_changed(
DBusDisplay *dpy,
GObject *object,
GParamSpec *pspec)
{
dbus_clipboard_unregister_proxy(dpy);
}
static gboolean static gboolean
dbus_clipboard_register( dbus_clipboard_register(
DBusDisplay *dpy, DBusDisplay *dpy,
@ -220,6 +211,7 @@ dbus_clipboard_register(
{ {
g_autoptr(GError) err = NULL; g_autoptr(GError) err = NULL;
const char *name = NULL; const char *name = NULL;
GDBusConnection *connection = g_dbus_method_invocation_get_connection(invocation);
if (dpy->clipboard_proxy) { if (dpy->clipboard_proxy) {
g_dbus_method_invocation_return_error( g_dbus_method_invocation_return_error(
@ -232,7 +224,7 @@ dbus_clipboard_register(
dpy->clipboard_proxy = dpy->clipboard_proxy =
qemu_dbus_display1_clipboard_proxy_new_sync( qemu_dbus_display1_clipboard_proxy_new_sync(
g_dbus_method_invocation_get_connection(invocation), connection,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
g_dbus_method_invocation_get_sender(invocation), g_dbus_method_invocation_get_sender(invocation),
"/org/qemu/Display1/Clipboard", "/org/qemu/Display1/Clipboard",
@ -252,7 +244,11 @@ dbus_clipboard_register(
g_object_connect(dpy->clipboard_proxy, g_object_connect(dpy->clipboard_proxy,
"swapped-signal::notify::g-name-owner", "swapped-signal::notify::g-name-owner",
dbus_on_clipboard_proxy_name_owner_changed, dpy, dbus_clipboard_unregister_proxy, dpy,
NULL);
g_object_connect(connection,
"swapped-signal::closed",
dbus_clipboard_unregister_proxy, dpy,
NULL); NULL);
qemu_clipboard_reset_serial(); qemu_clipboard_reset_serial();