From 4b87a1397422a1c30da0e593e2dfb93934dd7453 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Thu, 1 Sep 2011 10:36:16 +0200
Subject: [PATCH] clients: Fix typos

And forgotten display_create conversion in view.c.
---
 clients/view.c   | 2 +-
 clients/window.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/clients/view.c b/clients/view.c
index 00a83126..5e0f4bab 100644
--- a/clients/view.c
+++ b/clients/view.c
@@ -278,7 +278,7 @@ main(int argc, char *argv[])
 	struct display *d;
 	int i;
 
-	d = display_create(&argc, &argv, option_entries, NULL);
+	d = display_create(&argc, &argv, option_entries);
 	if (d == NULL) {
 		fprintf(stderr, "failed to create display: %m\n");
 		return -1;
diff --git a/clients/window.c b/clients/window.c
index bb0e5d81..68c1eadf 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -66,7 +66,7 @@ struct display {
 	int authenticated;
 	EGLDisplay dpy;
 	EGLConfig rgb_config;
-	EGLConfig premul_argb_config;
+	EGLConfig premultiplied_argb_config;
 	EGLContext ctx;
 	cairo_device_t *device;
 	int fd;
@@ -233,7 +233,7 @@ display_create_egl_window_surface(struct display *display,
 
 	if (flags & SURFACE_OPAQUE) {
 		config = display->rgb_config;
-		attribps = NULL;
+		attribs = NULL;
 	} else {
 		config = display->premultiplied_argb_config;
 		attribs = premul_attribs;
@@ -393,8 +393,7 @@ display_create_egl_image_surface_from_file(struct display *display,
 		}
 	}
 
-	visual = display->premultiplied_argb_visual;
-	surface = display_create_egl_image_surface(display, visual, rect);
+	surface = display_create_egl_image_surface(display, 0, rect);
 	if (surface == NULL) {
 		g_object_unref(pixbuf);
 		return NULL;
@@ -1864,7 +1863,7 @@ init_egl(struct display *d)
 	}
 
 	if (!eglChooseConfig(d->dpy, premul_argb_cfg_attribs,
-			     &d->premul_argb_config, 1, &n) || n != 1) {
+			     &d->premultiplied_argb_config, 1, &n) || n != 1) {
 		fprintf(stderr, "failed to choose premul argb config\n");
 		return -1;
 	}