# HG changeset patch
# User zas_
# Date 1208603513 0
# Node ID ce5316d2e2d0bbedb77ac951247b468629fb03b8
# Parent  4043254aee5b38b50eb97358deace7f84064a81f
Cleanup last patch:
- drop vd_pop_menu_dir_view_as_cb() since it is now unused.
- use G_N_ELEMENTS()

diff -r 4043254aee5b -r ce5316d2e2d0 src/view_dir.c
--- a/src/view_dir.c	Sat Apr 19 09:49:14 2008 +0000
+++ b/src/view_dir.c	Sat Apr 19 11:11:53 2008 +0000
@@ -441,26 +441,11 @@
 	file_util_delete_dir(vd->click_fd, vd->widget);
 }
 
-static void vd_pop_menu_dir_view_as_cb(GtkWidget *widget, gpointer data)
-{
-	ViewDir *vd = data;
-	DirViewType new_type = DIRVIEW_LIST;
-
-	if (!vd->layout) return;
-
-	switch(vd->type)
-	{
-	case DIRVIEW_LIST: new_type = DIRVIEW_TREE; break;
-	case DIRVIEW_TREE: new_type = DIRVIEW_LIST; break;
-	}
-	
-	layout_views_set(vd->layout, new_type, vd->layout->icon_view);
-}
-
-#define VIEW_DIR_AS_SUBMENU_KEY "view_dir_as"
+#define VIEW_DIR_AS_SUBMENU_KEY "view_dir_as_submenu"
 static void vd_pop_submenu_dir_view_as_cb(GtkWidget *widget, gpointer data)
 {
 	ViewDir *vd = data;
+
 	DirViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), VIEW_DIR_AS_SUBMENU_KEY));
 	layout_views_set(vd->layout, new_type, vd->layout->icon_view);
 }
@@ -620,7 +605,7 @@
 	submenu = gtk_menu_new();
         gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
 
-	for (i = 0; i < sizeof(menu_view_dir_radio_entries) / sizeof(GtkRadioActionEntry); i++)
+	for (i = 0; i < G_N_ELEMENTS(menu_view_dir_radio_entries); i++)
 		{
 		item = menu_item_add_check(submenu, menu_view_dir_radio_entries[i].label,
 					   (vd->type == menu_view_dir_radio_entries[i].value),