isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Use separate destructor for the gtk_primary_selection_offer

Browse Source 
Things don't mix well if we use the same destructor than wl_data_offer,
Use a separate destructor with no DnD paths whatsoever.

https://bugzilla.gnome.org/show_bug.cgi?id=762878
This commit is contained in:
Carlos Garnacho 2016-02-29 16:43:23 +01:00
parent 837836a722
commit 66be0387ee
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,6 +516,28 @@ destroy_data_offer (struct wl_resource *resource)
g_slice_free (MetaWaylandDataOffer, offer); g_slice_free (MetaWaylandDataOffer, offer);
} }
static void
destroy_primary_offer (struct wl_resource *resource)
{
MetaWaylandDataOffer *offer = wl_resource_get_user_data (resource);
if (offer->source)
{
if (offer == meta_wayland_data_source_get_current_offer (offer->source))
{
meta_wayland_data_source_cancel (offer->source);
meta_wayland_data_source_set_current_offer (offer->source, NULL);
}
g_object_remove_weak_pointer (G_OBJECT (offer->source),
(gpointer *)&offer->source);
offer->source = NULL;
}
meta_display_sync_wayland_input_focus (meta_get_display ());
g_slice_free (MetaWaylandDataOffer, offer);
}
static struct wl_resource * static struct wl_resource *
meta_wayland_data_source_send_offer (MetaWaylandDataSource *source, meta_wayland_data_source_send_offer (MetaWaylandDataSource *source,
struct wl_resource *target) struct wl_resource *target)
@ -563,7 +585,7 @@ meta_wayland_data_source_send_primary_offer (MetaWaylandDataSource *source,
wl_resource_set_implementation (offer->resource, wl_resource_set_implementation (offer->resource,
&primary_offer_interface, &primary_offer_interface,
offer, offer,
destroy_data_offer); destroy_primary_offer);
gtk_primary_selection_device_send_data_offer (target, offer->resource); gtk_primary_selection_device_send_data_offer (target, offer->resource);