1 files changed, 0 insertions, 65 deletions

diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index cbf801e6a..43f98841c 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -68,9 +68,6 @@ struct NautilusWindowSlotDetails {
 	GtkWidget *floating_bar;
 	GtkWidget *view_overlay;
 
-	/* no search results widget */
-	GtkWidget *no_search_results_widget;
-
 	/* slot contains
 	 *  1) an vbox containing extra_location_widgets
 	 *  2) the view
@@ -124,9 +121,6 @@ struct NautilusWindowSlotDetails {
 	NautilusWindowGoToCallback open_callback;
 	gpointer open_callback_user_data;
         gchar *view_mode_before_search;
-
-        /*Folder is empty */
-        GtkWidget *folder_is_empty_widget;
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -208,45 +202,12 @@ remove_loading_floating_bar (NautilusWindowSlot *slot)
 }
 
 static void
-check_empty_states (NautilusWindowSlot *slot)
-{
-	GList *files;
-	GList *filtered;
-        NautilusDirectory *directory;
-        gboolean show_hidden_files;
-
-        gtk_widget_hide (slot->details->no_search_results_widget);
-        gtk_widget_hide (slot->details->folder_is_empty_widget);
-        directory = nautilus_view_get_model (slot->details->content_view);
-        if (!slot->details->allow_stop && directory != NULL) {
-	        files = nautilus_directory_get_file_list (directory);
-                show_hidden_files = g_settings_get_boolean (gtk_filechooser_preferences,
-                                                            NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES);
-                filtered = nautilus_file_list_filter_hidden (files, show_hidden_files);
-                if (g_list_length (filtered) == 0) {
-                        if (NAUTILUS_IS_SEARCH_DIRECTORY (directory)) {
-	                        gtk_widget_show (slot->details->no_search_results_widget);
-                        } else {
-	                        gtk_widget_show (slot->details->folder_is_empty_widget);
-                        }
-                }
-                nautilus_file_list_unref (filtered);
-                nautilus_file_list_unref (files);
-        }
-}
-
-static void
 nautilus_window_slot_on_done_loading (NautilusDirectory  *directory,
                                       NautilusWindowSlot *slot)
 {
 
         remove_loading_floating_bar (slot);
         nautilus_window_slot_set_allow_stop (slot, FALSE);
-        /* For this pourpose, we could check directly to see if the view is empty,
-         * instead of avoiding races disconnecting the model when appropiate.
-         * But I think we are doing better disconnecting when we know the data
-         * of the directory is not valid */
-        check_empty_states (slot);
 }
 
 static void
@@ -646,7 +607,6 @@ static void
 nautilus_window_slot_constructed (GObject *object)
 {
 	NautilusWindowSlot *slot = NAUTILUS_WINDOW_SLOT (object);
-        GtkBuilder *builder;
 	GtkWidget *extras_vbox;
 
 	G_OBJECT_CLASS (nautilus_window_slot_parent_class)->constructed (object);
@@ -674,16 +634,6 @@ nautilus_window_slot_constructed (GObject *object)
 	gtk_box_pack_start (GTK_BOX (slot), slot->details->view_overlay, TRUE, TRUE, 0);
 	gtk_widget_show (slot->details->view_overlay);
 
-        builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-no-search-results.ui");
-	slot->details->no_search_results_widget = GTK_WIDGET (gtk_builder_get_object (builder, "no_search_results"));
-	gtk_overlay_add_overlay (GTK_OVERLAY (slot->details->view_overlay),
-				 slot->details->no_search_results_widget);
-        builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-folder-is-empty.ui");
-	slot->details->folder_is_empty_widget = GTK_WIDGET (gtk_builder_get_object (builder, "folder_is_empty"));
-	gtk_overlay_add_overlay (GTK_OVERLAY (slot->details->view_overlay),
-				 slot->details->folder_is_empty_widget);
-        g_object_unref (builder);
-
 	slot->details->floating_bar = nautilus_floating_bar_new (NULL, NULL, FALSE);
 	gtk_widget_set_halign (slot->details->floating_bar, GTK_ALIGN_END);
 	gtk_widget_set_valign (slot->details->floating_bar, GTK_ALIGN_END);
@@ -2293,8 +2243,6 @@ view_end_loading_cb (NautilusView       *view,
                 remove_loading_floating_bar (slot);
                 nautilus_window_slot_set_allow_stop (slot, FALSE);
         }
-
-        check_empty_states (slot);
 }
 
 static void
@@ -2368,7 +2316,6 @@ view_begin_loading_cb (NautilusView       *view,
 	}
 
         setup_loading_floating_bar (slot);
-        check_empty_states (slot);
 
 	nautilus_profile_end (NULL);
 }
@@ -2435,22 +2382,11 @@ nautilus_window_slot_setup_extra_location_widgets (NautilusWindowSlot *slot)
 }
 
 static void
-view_end_file_changes_cb (NautilusView       *view,
-                           NautilusWindowSlot *slot)
-{
-        /* When creating or deleting a file the done-loading signal is not emitted,
-         * given that the view doesn't actually reload, so connect to the
-         * end-file-changes for update the empty states */
-        check_empty_states (slot);
-}
-
-static void
 nautilus_window_slot_connect_new_content_view (NautilusWindowSlot *slot)
 {
 	if (slot->details->new_content_view != NULL) {
 		g_signal_connect (slot->details->new_content_view, "begin-loading", G_CALLBACK (view_begin_loading_cb), slot);
 		g_signal_connect (slot->details->new_content_view, "end-loading", G_CALLBACK (view_end_loading_cb), slot);
-		g_signal_connect (slot->details->new_content_view, "end-file-changes", G_CALLBACK (view_end_file_changes_cb), slot);
 	}
 }
 
@@ -2461,7 +2397,6 @@ nautilus_window_slot_disconnect_content_view (NautilusWindowSlot *slot)
 		/* disconnect old view */
 		g_signal_handlers_disconnect_by_func (slot->details->content_view, G_CALLBACK (view_end_loading_cb), slot);
 		g_signal_handlers_disconnect_by_func (slot->details->content_view, G_CALLBACK (view_begin_loading_cb), slot);
-		g_signal_handlers_disconnect_by_func (slot->details->content_view, G_CALLBACK (view_end_file_changes_cb), slot);
 	}
 }