Display compact view after list view, rather than before it. Fixes

2008-07-21  Christian Neumair  <cneumair@gnome.org>

	* src/file-manager/fm-icon-view.c (fm_icon_view_register),
	(fm_compact_view_register):
	* src/file-manager/fm-icon-view.h:
	* src/nautilus-application.c (nautilus_application_instance_init):
	* src/nautilus-file-management-properties.c:
	* src/nautilus-file-management-properties.glade:
	Display compact view after list view, rather than before it. Fixes
	keybindings, and #543934. Thanks to Diego Escalante Urrelo.

svn path=/trunk/; revision=14384

6 files changed, 21 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e3d2fc85..874223c4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2008-07-21  Christian Neumair  <cneumair@gnome.org>
 
+	* src/file-manager/fm-icon-view.c (fm_icon_view_register),
+	(fm_compact_view_register):
+	* src/file-manager/fm-icon-view.h:
+	* src/nautilus-application.c (nautilus_application_instance_init):
+	* src/nautilus-file-management-properties.c:
+	* src/nautilus-file-management-properties.glade:
+	Display compact view after list view, rather than before it. Fixes
+	keybindings, and #543934. Thanks to Diego Escalante Urrelo.
+
+2008-07-21  Christian Neumair  <cneumair@gnome.org>
+
 	* src/nautilus-location-bar.c (editable_activate_callback),
 	(nautilus_location_bar_init):
 	Do not emit "location-changed" if the entry is empty. Fixes #527552.
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 086de43cf..675815130 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -3023,7 +3023,12 @@ fm_icon_view_register (void)
 {
 	TRANSLATE_VIEW_INFO (fm_icon_view)
 	nautilus_view_factory_register (&fm_icon_view);
+}
 
+void
+fm_compact_view_register (void)
+{
 	TRANSLATE_VIEW_INFO (fm_compact_view)
 	nautilus_view_factory_register (&fm_compact_view);
 }
+
diff --git a/src/file-manager/fm-icon-view.h b/src/file-manager/fm-icon-view.h
index 6e3ca96f0..1288cb366 100644
--- a/src/file-manager/fm-icon-view.h
+++ b/src/file-manager/fm-icon-view.h
@@ -116,5 +116,6 @@ void    fm_icon_view_filter_by_screen (FMIconView *icon_view, gboolean filter);
 gboolean fm_icon_view_is_compact   (FMIconView *icon_view);
 
 void    fm_icon_view_register       (void);
+void    fm_compact_view_register    (void);
 
 #endif /* FM_ICON_VIEW_H */
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index ccf264e3f..3ceed6cfa 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -217,6 +217,7 @@ nautilus_application_instance_init (NautilusApplication *application)
 	fm_icon_view_register ();
 	fm_desktop_icon_view_register ();
 	fm_list_view_register ();
+	fm_compact_view_register ();
 #if ENABLE_EMPTY_VIEW
 	fm_empty_view_register ();
 #endif /* ENABLE_EMPTY_VIEW */
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index 9f92ab5b8..bb14fa3ea 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -79,8 +79,8 @@
 
 static const char * const default_view_values[] = {
 	"icon_view",
-	"compact_view",
 	"list_view",
+	"compact_view",
 	NULL
 };
 
diff --git a/src/nautilus-file-management-properties.glade b/src/nautilus-file-management-properties.glade
index 61080a940..5f2e1a525 100644
--- a/src/nautilus-file-management-properties.glade
+++ b/src/nautilus-file-management-properties.glade
@@ -168,8 +168,8 @@
 				<widget class="GtkComboBox" id="default_view_combobox">
 				  <property name="visible">True</property>
 				  <property name="items" translatable="yes">Icon View
-Compact View
-List View</property>
+List View
+Compact View</property>
 				  <property name="add_tearoffs">False</property>
 				  <property name="focus_on_click">True</property>
 				</widget>