diff src/image.c @ 334:df868b947aa0

Rename image-related options.

--- a/src/image.c	Sat Apr 12 09:41:44 2008 +0000
+++ b/src/image.c	Sat Apr 12 15:04:58 2008 +0000
@@ -427,13 +427,13 @@
 
 	if (!image_get_pixbuf(imd)) return;
 
-	if (options->exif_rotate_enable ||
+	if (options->image.exif_rotate_enable ||
 	    (imd->color_profile_enable && imd->color_profile_use_image) )
 		{
 		exif = exif_read_fd(imd->image_fd, (imd->color_profile_enable && imd->color_profile_use_image));
 		}
 
-	if (options->exif_rotate_enable && exif)
+	if (options->image.exif_rotate_enable && exif)
 		{
 		gint orientation;
 
@@ -938,7 +938,7 @@
 
 	pixbuf = image_get_pixbuf(imd);
 
-	if (options->enable_read_ahead && imd->image_fd && pixbuf)
+	if (options->image.enable_read_ahead && imd->image_fd && pixbuf)
 		{
 		if (imd->il)
 			{
@@ -1090,7 +1090,7 @@
 	imd->title_right = g_strdup(title_right);
 	imd->title_show_zoom = show_zoom;
 
-	if (!options->fit_window) window = NULL;
+	if (!options->image.fit_window_to_image) window = NULL;
 
 	pixbuf_renderer_set_parent((PixbufRenderer *)imd->pr, (GtkWindow *)window);
 
@@ -1663,7 +1663,7 @@
 		pixbuf_renderer_get_scaled_size((PixbufRenderer *)imd->pr, &width, &height);
 		}
 
-	pb = gdk_pixbuf_scale_simple(pixbuf, width, height, (GdkInterpType)options->zoom_quality);
+	pb = gdk_pixbuf_scale_simple(pixbuf, width, height, (GdkInterpType)options->image.zoom_quality);
 
 	gdk_pixbuf_render_pixmap_and_mask (pb, &pixmap, NULL, 128);
 	gdk_window_set_back_pixmap(rootwindow, pixmap, FALSE);
@@ -1715,17 +1715,17 @@
 
 static void image_options_set(ImageWindow *imd)
 {
-	g_object_set(G_OBJECT(imd->pr), "zoom_quality", options->zoom_quality,
-					"zoom_2pass", options->two_pass_zoom,
-					"zoom_expand", options->zoom_to_fit_expands,
-					"dither_quality", options->dither_quality,
-					"scroll_reset", options->scroll_reset_method,
-					"cache_display", options->tile_cache_max,
-					"window_fit", (imd->top_window_sync && options->fit_window),
-					"window_limit", options->limit_window_size,
-					"window_limit_value", options->max_window_size,
-					"autofit_limit", options->limit_autofit_size,
-					"autofit_limit_value", options->max_autofit_size,
+	g_object_set(G_OBJECT(imd->pr), "zoom_quality", options->image.zoom_quality,
+					"zoom_2pass", options->image.zoom_2pass,
+					"zoom_expand", options->image.zoom_to_fit_allow_expand,
+					"dither_quality", options->image.dither_quality,
+					"scroll_reset", options->image.scroll_reset_method,
+					"cache_display", options->image.tile_cache_max,
+					"window_fit", (imd->top_window_sync && options->image.fit_window_to_image),
+					"window_limit", options->image.limit_window_size,
+					"window_limit_value", options->image.max_window_size,
+					"autofit_limit", options->image.limit_autofit_size,
+					"autofit_limit_value", options->image.max_autofit_size,
 
 					NULL);