toytoolkit: Remove obsolete function window_set_custom().
authorScott Moreau <oreaus@gmail.com>
Thu, 12 Jul 2012 02:57:15 +0000 (20:57 -0600)
committerKristian Høgsberg <krh@bitplanet.net>
Thu, 12 Jul 2012 13:18:49 +0000 (09:18 -0400)
clients/tablet-shell.c
clients/window.c
clients/window.h
clients/wscreensaver.c

index 5a2bd34..0a66950 100644 (file)
@@ -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));
 }
index 9f41a9c..ab9d155 100644 (file)
@@ -2725,12 +2725,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)
index 23ad37d..de38647 100644 (file)
@@ -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 *
index f1461f8..ecb253a 100644 (file)
@@ -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),