mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename wl_data_offer to weston_data_offer

Browse Source 
Another left-over from when we moved the input structs.
dev
Kristian Høgsberg 11 years ago
parent 0e17de1c0b
commit 5e76a49d9c
2 changed files with 7 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      src/compositor.h
  2. 12
      src/data-device.c

2
src/compositor.h
Unescape View File

@ -275,7 +275,7 @@ struct weston_touch_grab {
struct weston_touch *touch; struct weston_touch *touch;
}; };
struct wl_data_offer { struct weston_data_offer {
struct wl_resource *resource; struct wl_resource *resource;
struct weston_data_source *source; struct weston_data_source *source;
struct wl_listener source_destroy_listener; struct wl_listener source_destroy_listener;

12
src/data-device.c
Unescape View File

@ -51,7 +51,7 @@ static void
data_offer_accept(struct wl_client *client, struct wl_resource *resource, data_offer_accept(struct wl_client *client, struct wl_resource *resource,
uint32_t serial, const char *mime_type) uint32_t serial, const char *mime_type)
{ {
struct wl_data_offer *offer = wl_resource_get_user_data(resource); struct weston_data_offer *offer = wl_resource_get_user_data(resource);
/* FIXME: Check that client is currently focused by the input /* FIXME: Check that client is currently focused by the input
* device that is currently dragging this data source. Should * device that is currently dragging this data source. Should
@ -65,7 +65,7 @@ static void
data_offer_receive(struct wl_client *client, struct wl_resource *resource, data_offer_receive(struct wl_client *client, struct wl_resource *resource,
const char *mime_type, int32_t fd) const char *mime_type, int32_t fd)
{ {
struct wl_data_offer *offer = wl_resource_get_user_data(resource); struct weston_data_offer *offer = wl_resource_get_user_data(resource);
if (offer->source) if (offer->source)
offer->source->send(offer->source, mime_type, fd); offer->source->send(offer->source, mime_type, fd);
@ -88,7 +88,7 @@ static const struct wl_data_offer_interface data_offer_interface = {
static void static void
destroy_data_offer(struct wl_resource *resource) destroy_data_offer(struct wl_resource *resource)
{ {
struct wl_data_offer *offer = wl_resource_get_user_data(resource); struct weston_data_offer *offer = wl_resource_get_user_data(resource);
if (offer->source) if (offer->source)
wl_list_remove(&offer->source_destroy_listener.link); wl_list_remove(&offer->source_destroy_listener.link);
@ -98,9 +98,9 @@ destroy_data_offer(struct wl_resource *resource)
static void static void
destroy_offer_data_source(struct wl_listener *listener, void *data) destroy_offer_data_source(struct wl_listener *listener, void *data)
{ {
struct wl_data_offer *offer; struct weston_data_offer *offer;
offer = container_of(listener, struct wl_data_offer, offer = container_of(listener, struct weston_data_offer,
source_destroy_listener); source_destroy_listener);
offer->source = NULL; offer->source = NULL;
@ -110,7 +110,7 @@ static struct wl_resource *
weston_data_source_send_offer(struct weston_data_source *source, weston_data_source_send_offer(struct weston_data_source *source,
struct wl_resource *target) struct wl_resource *target)
{ {
struct wl_data_offer *offer; struct weston_data_offer *offer;
char **p; char **p;
offer = malloc(sizeof *offer); offer = malloc(sizeof *offer);

Write Preview
Loading…
Cancel
Save