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/window.c

diff --git a/clients/window.c b/clients/window.c
index c49e365..aed2663 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -1514,7 +1514,7 @@
 	return scale;
 }
 
-static void frame_destroy(struct frame *frame);
+static void window_frame_destroy(struct frame *frame);
 
 static void
 surface_destroy(struct surface *surface)
@@ -1568,7 +1568,7 @@
 	}
 
 	if (window->frame)
-		frame_destroy(window->frame);
+		window_frame_destroy(window->frame);
 
 	if (window->shell_surface)
 		wl_shell_surface_destroy(window->shell_surface);
@@ -2706,7 +2706,7 @@
 }
 
 struct widget *
-frame_create(struct window *window, void *data)
+window_frame_create(struct window *window, void *data)
 {
 	struct frame *frame;
 
@@ -2742,7 +2742,8 @@
 }
 
 void
-frame_set_child_size(struct widget *widget, int child_width, int child_height)
+window_frame_set_child_size(struct widget *widget, int child_width,
+			    int child_height)
 {
 	struct display *display = widget->window->display;
 	struct theme *t = display->theme;
@@ -2766,7 +2767,7 @@
 }
 
 static void
-frame_destroy(struct frame *frame)
+window_frame_destroy(struct frame *frame)
 {
 	struct frame_button *button, *tmp;