Do not add default to short list; instead, make sure we don't fail if

	* src/nautilus-applicable-views.c (got_file_info_callback): Do not
	add default to short list; instead, make sure we don't fail if
	there is a default but not short list.

1 files changed, 2 insertions, 9 deletions

diff --git a/src/nautilus-applicable-views.c b/src/nautilus-applicable-views.c
index 0cd3fd38f..86d8d71fb 100644
--- a/src/nautilus-applicable-views.c
+++ b/src/nautilus-applicable-views.c
@@ -221,14 +221,6 @@ got_file_info_callback (GnomeVFSAsyncHandle *ah,
         if (default_component != NULL) {
         	default_id = nautilus_view_identifier_new_from_content_view (default_component);
                 CORBA_free (default_component);
-
-                if (g_list_find_custom (navinfo->content_identifiers, default_id, 
-                                        (GCompareFunc) nautilus_view_identifier_compare) == NULL) {
-                        /* FIXME: should insert in sorted order by name */
-                        navinfo->content_identifiers = g_list_prepend (navinfo->content_identifiers,
-                                                                       nautilus_view_identifier_copy (default_id));
-                }
-                
         } else if (navinfo->content_identifiers != NULL) {              
 		/* No default component, just take first one from list. */
                 default_id = nautilus_view_identifier_copy (navinfo->content_identifiers->data);
@@ -238,7 +230,8 @@ got_file_info_callback (GnomeVFSAsyncHandle *ah,
         printf ("XXXXXX - default_id: %s (%s)\n", default_id->iid, default_id->name);
 #endif
 
-        if (navinfo->content_identifiers != NULL) {
+        /* If no components found at all - if there are any, there will be a default. */
+        if (default_id != NULL) {
                 vfs_result_code = GNOME_VFS_OK;
                 result_code = get_nautilus_navigation_result_from_gnome_vfs_result (vfs_result_code);
         } else {