Index: src/file-manager/fm-desktop-icon-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-desktop-icon-view.c,v
retrieving revision 1.224
diff -u -p -r1.224 fm-desktop-icon-view.c
--- src/file-manager/fm-desktop-icon-view.c	2 Jun 2005 14:35:14 -0000	1.224
+++ src/file-manager/fm-desktop-icon-view.c	2 Jun 2005 19:33:46 -0000
@@ -89,7 +89,6 @@ static void     fm_desktop_icon_view_cla
 static void     default_zoom_level_changed                        (gpointer                user_data);
 static gboolean real_supports_auto_layout                         (FMIconView             *view);
 static gboolean real_supports_keep_aligned                        (FMIconView             *view);
-static gboolean real_supports_labels_beside_icons                 (FMIconView             *view);
 static void     real_merge_menus                                  (FMDirectoryView        *view);
 static void     real_update_menus                                 (FMDirectoryView        *view);
 static gboolean real_supports_zooming                             (FMDirectoryView        *view);
@@ -310,7 +309,6 @@ fm_desktop_icon_view_class_init (FMDeskt
 
 	FM_ICON_VIEW_CLASS (class)->supports_auto_layout = real_supports_auto_layout;
 	FM_ICON_VIEW_CLASS (class)->supports_keep_aligned = real_supports_keep_aligned;
-	FM_ICON_VIEW_CLASS (class)->supports_labels_beside_icons = real_supports_labels_beside_icons;
 }
 
 static void
@@ -752,12 +750,6 @@ static gboolean
 real_supports_keep_aligned (FMIconView *view)
 {
 	return TRUE;
-}
-
-static gboolean
-real_supports_labels_beside_icons (FMIconView *view)
-{
-	return FALSE;
 }
 
 static gboolean
Index: src/file-manager/fm-icon-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-icon-view.c,v
retrieving revision 1.309
diff -u -p -r1.309 fm-icon-view.c
--- src/file-manager/fm-icon-view.c	2 Jun 2005 16:16:55 -0000	1.309
+++ src/file-manager/fm-icon-view.c	2 Jun 2005 19:33:51 -0000
@@ -587,16 +587,6 @@ fm_icon_view_supports_keep_aligned (FMIc
 		 supports_keep_aligned, (view));
 }
 
-static gboolean
-fm_icon_view_supports_labels_beside_icons (FMIconView *view)
-{
-	g_return_val_if_fail (FM_IS_ICON_VIEW (view), FALSE);
-
-	return EEL_CALL_METHOD_WITH_RETURN_VALUE
-		(FM_ICON_VIEW_CLASS, view,
-		 supports_labels_beside_icons, (view));
-}
-
 static void
 update_layout_menus (FMIconView *view)
 {
@@ -945,14 +935,6 @@ real_supports_keep_aligned (FMIconView *
 }
 
 static gboolean
-real_supports_labels_beside_icons (FMIconView *view)
-{
-	g_return_val_if_fail (FM_IS_ICON_VIEW (view), TRUE);
-
-	return TRUE;
-}
-
-static gboolean
 set_sort_reversed (FMIconView *icon_view, gboolean new_value)
 {
 	if (icon_view->details->sort_reversed == new_value) {
@@ -1019,18 +1001,16 @@ set_labels_beside_icons (FMIconView *ico
 {
 	gboolean labels_beside;
 
-	if (fm_icon_view_supports_labels_beside_icons (icon_view)) {
-		labels_beside = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS);
-		
-		if (labels_beside) {
-			nautilus_icon_container_set_label_position
-				(get_icon_container (icon_view), 
-				 NAUTILUS_ICON_LABEL_POSITION_BESIDE);
-		} else {
-			nautilus_icon_container_set_label_position
-				(get_icon_container (icon_view), 
-				 NAUTILUS_ICON_LABEL_POSITION_UNDER);
-		}
+	labels_beside = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS);
+	
+	if (labels_beside) {
+		nautilus_icon_container_set_label_position
+			(get_icon_container (icon_view), 
+			 NAUTILUS_ICON_LABEL_POSITION_BESIDE);
+	} else {
+		nautilus_icon_container_set_label_position
+			(get_icon_container (icon_view), 
+			 NAUTILUS_ICON_LABEL_POSITION_UNDER);
 	}
 }
 
@@ -2564,7 +2544,6 @@ fm_icon_view_class_init (FMIconViewClass
 	klass->clean_up = fm_icon_view_real_clean_up;
 	klass->supports_auto_layout = real_supports_auto_layout;
 	klass->supports_keep_aligned = real_supports_keep_aligned;
-	klass->supports_labels_beside_icons = real_supports_labels_beside_icons;
         klass->get_directory_auto_layout = fm_icon_view_real_get_directory_auto_layout;
         klass->get_directory_sort_by = fm_icon_view_real_get_directory_sort_by;
         klass->get_directory_sort_reversed = fm_icon_view_real_get_directory_sort_reversed;
