commit ff39efa5c01eb51daf73593cd7a39cc3fac6d48e
author Hardening <rdp.effort@gmail.com> Wed Sep 18 23:56:35 2013 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Sat Sep 21 11:40:17 2013 -0700
tree 754846a4f22eec2e650be1727c69fa12e7067ad3
parent a2df51c19f46f8b8b6a9968e18490d7ce99d32c1

Rename current, origin, scale, origin_scale

This patch renames that fields to have consistent names.

src/compositor-fbdev.c

diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
index 2b48319..e592fe5 100644
--- a/src/compositor-fbdev.c
+++ b/src/compositor-fbdev.c
@@ -543,8 +543,8 @@
 	wl_list_init(&output->base.mode_list);
 	wl_list_insert(&output->base.mode_list, &output->mode.link);
 
-	output->base.current = &output->mode;
-	output->base.origin = &output->mode;
+	output->base.current_mode = &output->mode;
+	output->base.original_mode = &output->mode;
 	output->base.subpixel = WL_OUTPUT_SUBPIXEL_UNKNOWN;
 	output->base.make = "unknown";
 	output->base.model = output->fb_info.id;