isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 16:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Drop unused wl_signal structs

Browse Source 
Those were used to signal clipboard ownership around, but that got
replaced by MetaSelection and friends. These signals are no longer
listened on, so can be safely removed.

https://gitlab.gnome.org/GNOME/mutter/issues/591

(cherry picked from commit 46b3811e22)
This commit is contained in:
Carlos Garnacho 2019-11-20 00:27:54 +01:00
parent d78585d68a
commit eac37b17b0
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wayland/meta-wayland-data-device.c
View File

@ -1318,7 +1318,6 @@ selection_data_source_destroyed (gpointer data, GObject *object_was_here)
wl_data_device_send_selection (data_device_resource, NULL); wl_data_device_send_selection (data_device_resource, NULL);
} }
wl_signal_emit (&data_device->selection_ownership_signal, NULL);
unset_selection_source (data_device, META_SELECTION_CLIPBOARD); unset_selection_source (data_device, META_SELECTION_CLIPBOARD);
} }
@ -1614,8 +1613,6 @@ meta_wayland_data_device_set_dnd_source (MetaWaylandDataDevice *data_device,
if (source) if (source)
g_object_add_weak_pointer (G_OBJECT (data_device->dnd_data_source), g_object_add_weak_pointer (G_OBJECT (data_device->dnd_data_source),
(gpointer *)&data_device->dnd_data_source); (gpointer *)&data_device->dnd_data_source);
wl_signal_emit (&data_device->dnd_ownership_signal, source);
} }
void void
@ -1673,8 +1670,6 @@ meta_wayland_data_device_set_selection (MetaWaylandDataDevice *data_device,
wl_data_device_send_selection (data_device_resource, offer); wl_data_device_send_selection (data_device_resource, offer);
} }
} }
wl_signal_emit (&data_device->selection_ownership_signal, source);
} }
static void static void
@ -1735,7 +1730,6 @@ primary_source_destroyed (gpointer data,
gtk_primary_selection_device_send_selection (data_device_resource, NULL); gtk_primary_selection_device_send_selection (data_device_resource, NULL);
} }
wl_signal_emit (&data_device->primary_ownership_signal, NULL);
unset_selection_source (data_device, META_SELECTION_PRIMARY); unset_selection_source (data_device, META_SELECTION_PRIMARY);
} }
@ -1804,8 +1798,6 @@ meta_wayland_data_device_set_primary (MetaWaylandDataDevice *data_device,
gtk_primary_selection_device_send_selection (data_device_resource, offer); gtk_primary_selection_device_send_selection (data_device_resource, offer);
} }
} }
wl_signal_emit (&data_device->primary_ownership_signal, source);
} }
static void static void
@ -2022,9 +2014,6 @@ meta_wayland_data_device_init (MetaWaylandDataDevice *data_device)
{ {
wl_list_init (&data_device->resource_list); wl_list_init (&data_device->resource_list);
wl_list_init (&data_device->primary_resource_list); wl_list_init (&data_device->primary_resource_list);
wl_signal_init (&data_device->selection_ownership_signal);
wl_signal_init (&data_device->primary_ownership_signal);
wl_signal_init (&data_device->dnd_ownership_signal);
} }
static struct wl_resource * static struct wl_resource *

4
src/wayland/meta-wayland-data-device.h
View File

@ -67,10 +67,6 @@ struct _MetaWaylandDataDevice
MetaWaylandDragGrab *current_grab; MetaWaylandDragGrab *current_grab;
struct wl_client *focus_client; struct wl_client *focus_client;
struct wl_signal selection_ownership_signal;
struct wl_signal dnd_ownership_signal;
struct wl_signal primary_ownership_signal;
guint selection_owner_signal_id; guint selection_owner_signal_id;
MetaSelectionSource *owners[META_N_SELECTION_TYPES]; MetaSelectionSource *owners[META_N_SELECTION_TYPES];