commit ee7fefcffc73fbf2e5fbe2bcb08a3918f202144b
author Jason Ekstrand <jason@jlekstrand.net> Sun Oct 13 19:08:38 2013 -0500
committer Kristian Høgsberg <krh@bitplanet.net> Sun Oct 13 22:12:16 2013 -0700
tree 744dc1c984fda76ae225ce5eb2b7d12f6fa60b7b
parent bcfd07b70a96bb21d9b8e5251d6551ef6ad8d1ad

Rename frame_create and frame_set_child_size with a window_ prefix

This is to avoid a collision with an actual frame structure.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>

clients/desktop-shell.c

diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index 599c0a5..8c97104 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -896,7 +896,7 @@
 	dialog = xzalloc(sizeof *dialog);
 
 	dialog->window = window_create_custom(display);
-	dialog->widget = frame_create(dialog->window, dialog);
+	dialog->widget = window_frame_create(dialog->window, dialog);
 	window_set_title(dialog->window, "Unlock your desktop");
 
 	window_set_user_data(dialog->window, dialog);