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-headless.c

diff --git a/src/compositor-headless.c b/src/compositor-headless.c
index 4a0cc7f..3761be1 100644
--- a/src/compositor-headless.c
+++ b/src/compositor-headless.c
@@ -107,7 +107,7 @@
 	wl_list_init(&output->base.mode_list);
 	wl_list_insert(&output->base.mode_list, &output->mode.link);
 
-	output->base.current = &output->mode;
+	output->base.current_mode = &output->mode;
 	weston_output_init(&output->base, &c->base, 0, 0, width, height,
 			   WL_OUTPUT_TRANSFORM_NORMAL, 1);
 
@@ -120,7 +120,7 @@
 	output->finish_frame_timer =
 		wl_event_loop_add_timer(loop, finish_frame_handler, output);
 
-	output->base.origin = output->base.current;
+	output->base.original_mode = output->base.current_mode;
 	output->base.start_repaint_loop = headless_output_start_repaint_loop;
 	output->base.repaint = headless_output_repaint;
 	output->base.destroy = headless_output_destroy;