[mutter/wip/carlosg/fix-dnd-crash: 1/4] wayland: Drop unused wl_signal structs
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/fix-dnd-crash: 1/4] wayland: Drop unused wl_signal structs
- Date: Wed, 20 Nov 2019 00:00:26 +0000 (UTC)
commit 77fa0271e0268cbc445dbd374fd90888c665f67c
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Nov 20 00:27:54 2019 +0100
wayland: Drop unused wl_signal structs
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
src/wayland/meta-wayland-data-device.c | 11 -----------
src/wayland/meta-wayland-data-device.h | 4 ----
2 files changed, 15 deletions(-)
---
diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c
index 2887da62d..3a9f276aa 100644
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -1327,7 +1327,6 @@ selection_data_source_destroyed (gpointer data, GObject *object_was_here)
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);
}
@@ -1599,8 +1598,6 @@ meta_wayland_data_device_set_dnd_source (MetaWaylandDataDevice *data_device,
if (source)
g_object_add_weak_pointer (G_OBJECT (data_device->dnd_data_source),
(gpointer *)&data_device->dnd_data_source);
-
- wl_signal_emit (&data_device->dnd_ownership_signal, source);
}
void
@@ -1658,8 +1655,6 @@ meta_wayland_data_device_set_selection (MetaWaylandDataDevice *data_device,
wl_data_device_send_selection (data_device_resource, offer);
}
}
-
- wl_signal_emit (&data_device->selection_ownership_signal, source);
}
static void
@@ -1725,7 +1720,6 @@ primary_source_destroyed (gpointer data,
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);
}
@@ -1785,8 +1779,6 @@ meta_wayland_data_device_set_primary (MetaWaylandDataDevice *data_device,
gtk_primary_selection_device_send_selection (data_device_resource, offer);
}
}
-
- wl_signal_emit (&data_device->primary_ownership_signal, source);
}
static void
@@ -2009,9 +2001,6 @@ meta_wayland_data_device_init (MetaWaylandDataDevice *data_device)
{
wl_list_init (&data_device->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 *
diff --git a/src/wayland/meta-wayland-data-device.h b/src/wayland/meta-wayland-data-device.h
index efa5478bf..c61c241a5 100644
--- a/src/wayland/meta-wayland-data-device.h
+++ b/src/wayland/meta-wayland-data-device.h
@@ -67,10 +67,6 @@ struct _MetaWaylandDataDevice
MetaWaylandDragGrab *current_grab;
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;
MetaSelectionSource *owners[META_N_SELECTION_TYPES];
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]