[nautilus] icon-container: remove now unused properties

[Cosimo Cecchi <cosimoc src gnome org>]

commit e7d665effe4a464bf1943d5be779623c59a3eeb0
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri May 25 16:47:55 2012 -0400

    icon-container: remove now unused properties
    
    Since we removed compact view, also remove the NautilusIconContainer
    properties that were only used by it.

 libnautilus-private/nautilus-icon-canvas-item.c |    6 +--
 libnautilus-private/nautilus-icon-container.c   |   60 +++--------------------
 libnautilus-private/nautilus-icon-container.h   |    4 --
 libnautilus-private/nautilus-icon-private.h     |    8 ---
 4 files changed, 9 insertions(+), 69 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index 4735e71..2a1a127 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -2055,11 +2055,7 @@ nautilus_icon_canvas_item_get_max_text_width (NautilusIconCanvasItem *item)
 	if (container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
 		if (container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_L_R ||
 		    container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L) {
-			if (container->details->all_columns_same_width) {
-				return MAX_TEXT_WIDTH_BESIDE_TOP_TO_BOTTOM * canvas_item->canvas->pixels_per_unit;
-			} else {
-				return -1;
-			}
+			return -1;
 		} else {
 			return MAX_TEXT_WIDTH_BESIDE * canvas_item->canvas->pixels_per_unit;
 		}
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 0dc66da..2033038 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -1506,21 +1506,15 @@ lay_down_icons_vertical (NautilusIconContainer *container,
 			x += ICON_PAD_LEFT;
 
 			/* correctly set (per-column) width */
-			if (!container->details->all_columns_same_width) {
-				for (i = 0; i < (int) positions->len; i++) {
-					position = &g_array_index (positions, IconPositions, i);
-					position->width = max_width_in_column;
-				}
+			for (i = 0; i < (int) positions->len; i++) {
+				position = &g_array_index (positions, IconPositions, i);
+				position->width = max_width_in_column;
 			}
 
 			lay_down_one_column (container, line_start, p, x, CONTAINER_PAD_TOP, max_height_with_borders, positions);
 
 			/* Advance to next column. */
-			if (container->details->all_columns_same_width) {
-				x += max_width + ICON_PAD_RIGHT;
-			} else {
-				x += max_width_in_column + ICON_PAD_RIGHT;
-			}
+			x += max_width_in_column + ICON_PAD_RIGHT;
 
 			line_height = ICON_PAD_TOP;
 			line_start = p;
@@ -1538,9 +1532,8 @@ lay_down_icons_vertical (NautilusIconContainer *container,
 
 		g_array_set_size (positions, i + 1);
 		position = &g_array_index (positions, IconPositions, i++);
-		if (container->details->all_columns_same_width) {
-			position->width = max_width;
-		}
+
+		position->width = max_width;
 		position->height = max_height;
 		position->y_offset = ICON_PAD_TOP;
 		position->x_offset = ICON_PAD_LEFT;
@@ -6878,12 +6871,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 	max_image_size = MAX (MAXIMUM_IMAGE_SIZE * EEL_CANVAS (container)->pixels_per_unit, NAUTILUS_ICON_MAXIMUM_SIZE);
 
 	/* Get the appropriate images for the file. */
-	if (container->details->forced_icon_size > 0) {
-		icon_size = container->details->forced_icon_size;
-	} else {
-		icon_get_size (container, icon, &icon_size);
-	}
-
+	icon_get_size (container, icon, &icon_size);
 
 	icon_size = MAX (icon_size, min_image_size);
 	icon_size = MIN (icon_size, max_image_size);
@@ -6899,11 +6887,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 							     large_embedded_text, &embedded_text_needs_loading,
 							     &has_open_window);
 
-	if (container->details->forced_icon_size > 0) {
-		pixbuf = nautilus_icon_info_get_pixbuf_at_size (icon_info, icon_size);
-	} else {
-		pixbuf = nautilus_icon_info_get_pixbuf (icon_info);
-	}
+	pixbuf = nautilus_icon_info_get_pixbuf (icon_info);
 
 	nautilus_icon_info_get_attach_points (icon_info, &attach_points, &n_attach_points);
 	has_embedded_text_rect = nautilus_icon_info_get_embedded_rect (icon_info,
@@ -8483,34 +8467,6 @@ nautilus_icon_container_set_allow_moves	(NautilusIconContainer *container,
 	container->details->drag_allow_moves = allow_moves;
 }
 
-void
-nautilus_icon_container_set_forced_icon_size (NautilusIconContainer *container,
-					      int                    forced_icon_size)
-{
-	g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
-
-	if (forced_icon_size != container->details->forced_icon_size) {
-		container->details->forced_icon_size = forced_icon_size;
-
-		invalidate_label_sizes (container);
-		nautilus_icon_container_request_update_all (container);
-	}
-}
-
-void
-nautilus_icon_container_set_all_columns_same_width (NautilusIconContainer *container,
-						    gboolean               all_columns_same_width)
-{
-	g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
-
-	if (all_columns_same_width != container->details->all_columns_same_width) {
-		container->details->all_columns_same_width = all_columns_same_width;
-
-		invalidate_labels (container);
-		nautilus_icon_container_request_update_all (container);
-	}
-}
-
 /**
  * nautilus_icon_container_set_highlighted_for_clipboard
  * @container: An icon container widget.
diff --git a/libnautilus-private/nautilus-icon-container.h b/libnautilus-private/nautilus-icon-container.h
index 50e39ce..f87ba15 100644
--- a/libnautilus-private/nautilus-icon-container.h
+++ b/libnautilus-private/nautilus-icon-container.h
@@ -336,10 +336,6 @@ char*             nautilus_icon_container_get_icon_description          (Nautilu
 gboolean          nautilus_icon_container_get_allow_moves               (NautilusIconContainer  *container);
 void              nautilus_icon_container_set_allow_moves               (NautilusIconContainer  *container,
 									 gboolean                allow_moves);
-void		  nautilus_icon_container_set_forced_icon_size		(NautilusIconContainer  *container,
-									 int                     forced_icon_size);
-void		  nautilus_icon_container_set_all_columns_same_width	(NautilusIconContainer  *container,
-									 gboolean                all_columns_same_width);
 
 gboolean	  nautilus_icon_container_is_layout_rtl			(NautilusIconContainer  *container);
 gboolean	  nautilus_icon_container_is_layout_vertical		(NautilusIconContainer  *container);
diff --git a/libnautilus-private/nautilus-icon-private.h b/libnautilus-private/nautilus-icon-private.h
index b0336e2..a680586 100644
--- a/libnautilus-private/nautilus-icon-private.h
+++ b/libnautilus-private/nautilus-icon-private.h
@@ -212,21 +212,13 @@ struct NautilusIconContainerDetails {
 	/* Mode settings. */
 	gboolean single_click_mode;
 	gboolean auto_layout;
-	gboolean tighter_layout;
 
-	/* Whether for the vertical layout, all columns are supposed to
-	 * have the same width. */
-	gboolean all_columns_same_width;
-	
 	/* Layout mode */
 	NautilusIconLayoutMode layout_mode;
 
 	/* Label position */
 	NautilusIconLabelPosition label_position;
 
-	/* Forced icon size, iff greater than 0 */
-	int forced_icon_size;
-
 	/* Should the container keep icons aligned to a grid */
 	gboolean keep_aligned;