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

wayland_client: rename wl_display_create to wl_display_connect

Browse Source 
Avoid conflict when using wayland-{server,client} together.
This commit is contained in:
Benjamin Franzke
2010-11-27 19:04:11 +01:00
committed by Kristian Høgsberg
parent c1ad1f9c9b
commit 35fd2a8cc6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/screenshot.c
+1 -1
View File
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
GSource *source; GSource *source;
struct wl_screenshooter *screenshooter; struct wl_screenshooter *screenshooter;
display = wl_display_create(socket_name, sizeof socket_name); display = wl_display_connect(socket_name, sizeof socket_name);
if (display == NULL) { if (display == NULL) {
fprintf(stderr, "failed to create display: %m\n"); fprintf(stderr, "failed to create display: %m\n");
return -1; return -1;
clients/window.c
+1 -1
View File
@@ -1425,7 +1425,7 @@ display_create(int *argc, char **argv[], const GOptionEntry *option_entries)
if (d == NULL) if (d == NULL)
return NULL; return NULL;
d->display = wl_display_create(socket_name, sizeof socket_name); d->display = wl_display_connect(socket_name, sizeof socket_name);
if (d->display == NULL) { if (d->display == NULL) {
fprintf(stderr, "failed to create display: %m\n"); fprintf(stderr, "failed to create display: %m\n");
return NULL; return NULL;
wayland/wayland-client.c
+1 -1
View File
@@ -329,7 +329,7 @@ static const struct wl_display_listener display_listener = {
}; };
WL_EXPORT struct wl_display * WL_EXPORT struct wl_display *
wl_display_create(const char *name, size_t name_size) wl_display_connect(const char *name, size_t name_size)
{ {
struct wl_display *display; struct wl_display *display;
struct sockaddr_un addr; struct sockaddr_un addr;
wayland/wayland-client.h
+1 -1
View File
@@ -37,7 +37,7 @@ typedef int (*wl_display_update_func_t)(uint32_t mask, void *data);
typedef void (*wl_display_sync_func_t)(void *data); typedef void (*wl_display_sync_func_t)(void *data);
typedef void (*wl_display_frame_func_t)(void *data, uint32_t time); typedef void (*wl_display_frame_func_t)(void *data, uint32_t time);
struct wl_display *wl_display_create(const char *name, size_t name_size); struct wl_display *wl_display_connect(const char *name, size_t name_size);
void wl_display_destroy(struct wl_display *display); void wl_display_destroy(struct wl_display *display);
int wl_display_get_fd(struct wl_display *display, int wl_display_get_fd(struct wl_display *display,
wl_display_update_func_t update, void *data); wl_display_update_func_t update, void *data);