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

Rename wl_data_source to weston_data_source

Browse Source 
Missed this rename when we moved the input structs over from wayland.
This commit is contained in:
Kristian Høgsberg
2013-07-25 15:52:14 -07:00
parent 862814b2e6
commit 7ff3bdb5f7
4 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xwayland/selection.c
+6 -6
View File
@@ -106,18 +106,18 @@ weston_wm_get_incr_chunk(struct weston_wm *wm)
}
struct x11_data_source {
struct wl_data_source base;
struct weston_data_source base;
struct weston_wm *wm;
};
static void
data_source_accept(struct wl_data_source *source,
data_source_accept(struct weston_data_source *source,
uint32_t time, const char *mime_type)
{
}
static void
data_source_send(struct wl_data_source *base,
data_source_send(struct weston_data_source *base,
const char *mime_type, int32_t fd)
{
struct x11_data_source *source = (struct x11_data_source *) base;
@@ -140,7 +140,7 @@ data_source_send(struct wl_data_source *base,
}
static void
data_source_cancel(struct wl_data_source *source)
data_source_cancel(struct weston_data_source *source)
{
}
@@ -421,7 +421,7 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data)
static void
weston_wm_send_data(struct weston_wm *wm, xcb_atom_t target, const char *mime_type)
{
struct wl_data_source *source;
struct weston_data_source *source;
struct weston_seat *seat = weston_wm_pick_seat(wm);
int p[2];
@@ -621,7 +621,7 @@ weston_wm_set_selection(struct wl_listener *listener, void *data)
struct weston_seat *seat = data;
struct weston_wm *wm =
container_of(listener, struct weston_wm, selection_listener);
struct wl_data_source *source = seat->selection_data_source;
struct weston_data_source *source = seat->selection_data_source;
const char **p, **end;
int has_text_plain = 0;