[weston PATCH 2/2] toytoolkit: Remove obsolete function window_set_custom().

[Scott Moreau]

---
 clients/tablet-shell.c |    9 +++------
 clients/window.c       |    6 ------
 clients/window.h       |    3 ---
 clients/wscreensaver.c |    1 -
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/clients/tablet-shell.c b/clients/tablet-shell.c
index 5a2bd34..0a66950 100644
--- a/clients/tablet-shell.c
+++ b/clients/tablet-shell.c
@@ -233,10 +233,9 @@ homescreen_create(struct tablet *tablet)
 	homescreen = malloc (sizeof *homescreen);
 	memset(homescreen, 0, sizeof *homescreen);
 
-	homescreen->window = window_create(tablet->display);
+	homescreen->window = window_create_custom(tablet->display);
 	homescreen->widget =
 		window_add_widget(homescreen->window, homescreen);
-	window_set_custom(homescreen->window);
 	window_set_user_data(homescreen->window, homescreen);
 	window_set_title(homescreen->window, "homescreen");
 	widget_set_redraw_handler(homescreen->widget, homescreen_draw);
@@ -252,12 +251,11 @@ lockscreen_create(struct tablet *tablet)
 	lockscreen = malloc (sizeof *lockscreen);
 	memset(lockscreen, 0, sizeof *lockscreen);
 
-	lockscreen->window = window_create(tablet->display);
+	lockscreen->window = window_create_custom(tablet->display);
 	lockscreen->widget =
 		window_add_widget(lockscreen->window, lockscreen);
 	window_set_user_data(lockscreen->window, lockscreen);
 	window_set_title(lockscreen->window, "lockscreen");
-	window_set_custom(lockscreen->window);
 	widget_set_redraw_handler(lockscreen->widget, lockscreen_draw);
 	widget_set_button_handler(lockscreen->widget,
 				  lockscreen_button_handler);
@@ -284,9 +282,8 @@ show_switcher(void *data, struct tablet_shell *tablet_shell)
 {
 	struct tablet *tablet = data;
 
-	tablet->switcher = window_create(tablet->display);
+	tablet->switcher = window_create_custom(tablet->display);
 	window_set_user_data(tablet->switcher, tablet);
-	window_set_custom(tablet->switcher);
 	tablet_shell_set_switcher(tablet->tablet_shell,
 				  window_get_wl_surface(tablet->switcher));
 }
diff --git a/clients/window.c b/clients/window.c
index 8f3c942..4c385f2 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -2724,12 +2724,6 @@ window_schedule_redraw(struct window *window)
 }
 
 void
-window_set_custom(struct window *window)
-{
-	window->type = TYPE_CUSTOM;
-}
-
-void
 window_set_fullscreen(struct window *window, int fullscreen)
 {
 	if (!window->display->shell)
diff --git a/clients/window.h b/clients/window.h
index 23ad37d..de38647 100644
--- a/clients/window.h
+++ b/clients/window.h
@@ -279,9 +279,6 @@ void
 window_set_maximized(struct window *window, int maximized);
 
 void
-window_set_custom(struct window *window);
-
-void
 window_set_user_data(struct window *window, void *data);
 
 void *
diff --git a/clients/wscreensaver.c b/clients/wscreensaver.c
index f1461f8..ecb253a 100644
--- a/clients/wscreensaver.c
+++ b/clients/wscreensaver.c
@@ -195,7 +195,6 @@ create_wscreensaver_instance(struct wscreensaver *screensaver,
 	window_set_title(mi->window, progname);
 
 	if (screensaver->interface && !demo_mode) {
-		window_set_custom(mi->window);
 		mi->widget = window_add_widget(mi->window, mi);
 		screensaver_set_surface(screensaver->interface,
 					window_get_wl_surface(mi->window),
-- 
1.7.10.4