Index: magnifier/magnifier-main.c
===================================================================
--- magnifier/magnifier-main.c	(revision 433)
+++ magnifier/magnifier-main.c	(working copy)
@@ -38,35 +38,35 @@
 GNOME_Magnifier_ZoomRegion zoom_region;
 
 typedef struct {
-	gchar *target_display;
-	gchar *source_display;
-	gchar *cursor_set;
-	gchar *smoothing_type;
-	float zoom_factor;
-	float zoom_factor_x;
-	float zoom_factor_y;
-	int   refresh_time;
-	int   mouse_poll_time;
-	int   cursor_size;
-	float cursor_scale_factor;
-	guint32 cursor_color;
-	int   vertical_split;
-	int   horizontal_split;
-	int   fullscreen;
-	int   mouse_follow;
-	int   invert_image;
-	int   no_initial_region;
-	int   timing_iterations;
-	int   timing_output;
-	int   timing_delta_x;
-	int   timing_delta_y;
-	int   timing_pan_rate;
-	int   smooth_scroll;
-	int   border_width;
-	unsigned long  border_color;
-	int   test_pattern;
-        int   is_override_redirect;
-        int   ignore_damage;
+	gchar    *target_display;
+	gchar    *source_display;
+	gchar    *cursor_set;
+	gchar    *smoothing_type;
+	gdouble   zoom_factor;
+	gdouble   zoom_factor_x;
+	gdouble   zoom_factor_y;
+	gint      refresh_time;
+	gint      mouse_poll_time;
+	gint      cursor_size;
+	gdouble   cursor_scale_factor;
+	gint64    cursor_color;
+	gboolean  vertical_split;
+	gboolean  horizontal_split;
+	gboolean  fullscreen;
+	gboolean  mouse_follow;
+	gboolean  invert_image;
+	gboolean  no_initial_region;
+	gint      timing_iterations;
+	gboolean  timing_output;
+	gint      timing_delta_x;
+	gint      timing_delta_y;
+	gint      timing_pan_rate;
+	gboolean  smooth_scroll;
+	gint      border_width;
+	gint64    border_color;
+	gboolean  test_pattern;
+	gboolean  is_override_redirect;
+	gboolean  ignore_damage;
 } MagnifierOptions;
 
 static MagnifierOptions global_options = { NULL,
