bookmarks: remove bookmarks manager

Current bookmark manager is mostly a "show the internals in the UI",
with just showing the properties in a text base way.

Users can already accomplish the key functions of the manager through
the sidebar: you can rename, remove, and reorder through drag and drop.

The only thing you can't do with the sidebar is edit the path of a
bookmark, but I would argue that that's problematic anyway (since you
can break bookmarks that way, and it is much less error-prone to
navigate to the location and bookmark it than hand edit a location
field).

The fact that the only way to open the bookmark manager is through a
keyboard shortcut is probably a sign that it isn't really getting used
anyway, and that it isn't worth the trouble of fixing it up.

So remove it and instead, if needed, focus on improving bookmarks
management in the sidebar.

https://bugzilla.gnome.org/show_bug.cgi?id=759504

9 files changed, 17 insertions, 1453 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 44f978061..a70237a7c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,8 +144,6 @@ nautilus_SOURCES = \
 	nautilus-application-actions.h		\
 	nautilus-bookmark-list.c		\
 	nautilus-bookmark-list.h		\
-	nautilus-bookmarks-window.c		\
-	nautilus-bookmarks-window.h		\
 	nautilus-canvas-view.c			\
 	nautilus-canvas-view.h			\
 	nautilus-canvas-view-container.c	\
diff --git a/src/nautilus-application-actions.c b/src/nautilus-application-actions.c
index 4682de34f..8f6ebae90 100644
--- a/src/nautilus-application-actions.c
+++ b/src/nautilus-application-actions.c
@@ -47,17 +47,6 @@ action_new_window (GSimpleAction *action,
 }
 
 static void
-action_bookmarks (GSimpleAction *action,
-		  GVariant *parameter,
-		  gpointer user_data)
-{
-	GtkApplication *application = user_data;
-
-	nautilus_application_edit_bookmarks (NAUTILUS_APPLICATION (application),
-					     NAUTILUS_WINDOW (gtk_application_get_active_window (application)));
-}
-
-static void
 action_preferences (GSimpleAction *action,
 		    GVariant *parameter,
 		    gpointer user_data)
@@ -195,7 +184,6 @@ action_show_help_overlay (GSimpleAction *action,
 
 static GActionEntry app_entries[] = {
 	{ "new-window", action_new_window, NULL, NULL, NULL },
-	{ "bookmarks", action_bookmarks, NULL, NULL, NULL },
 	{ "preferences", action_preferences, NULL, NULL, NULL },
 	{ "show-hide-sidebar", NULL, NULL, "true", action_show_hide_sidebar },
 	{ "about", action_about, NULL, NULL, NULL },
@@ -233,5 +221,4 @@ nautilus_init_application_actions (NautilusApplication *app)
 					    g_variant_new_boolean (show_sidebar));
 
 	nautilus_application_add_accelerator (G_APPLICATION (app), "app.show-hide-sidebar", "F9");
-	nautilus_application_add_accelerator (G_APPLICATION (app), "app.bookmarks", "<control>b");
 }
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index cba275c20..fe298dc62 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -30,7 +30,6 @@
 #include "nautilus-application.h"
 
 #include "nautilus-application-actions.h"
-#include "nautilus-bookmarks-window.h"
 #include "nautilus-dbus-manager.h"
 #include "nautilus-desktop-window.h"
 #include "nautilus-freedesktop-dbus.h"
@@ -112,16 +111,6 @@ nautilus_application_get_bookmarks (NautilusApplication *application)
 	return application->priv->bookmark_list;
 }
 
-void
-nautilus_application_edit_bookmarks (NautilusApplication *application,
-				     NautilusWindow      *window)
-{
-	GtkWindow *bookmarks_window;
-
-	bookmarks_window = nautilus_bookmarks_window_new (window);
-	gtk_window_present (bookmarks_window);
-}
-
 static gboolean
 check_required_directories (NautilusApplication *application)
 {
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index 3e482c988..b62414ab9 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -237,124 +237,6 @@ insert_bookmark_internal (NautilusBookmarkList *bookmarks,
 }
 
 /**
- * nautilus_bookmark_list_append:
- *
- * Append a bookmark to a bookmark list.
- * @bookmarks: NautilusBookmarkList to append to.
- * @bookmark: Bookmark to append a copy of.
- **/
-void
-nautilus_bookmark_list_append (NautilusBookmarkList *bookmarks, 
-			       NautilusBookmark     *bookmark)
-{
-	g_return_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks));
-	g_return_if_fail (NAUTILUS_IS_BOOKMARK (bookmark));
-
-	if (g_list_find_custom (bookmarks->list, bookmark,
-				nautilus_bookmark_compare_with) != NULL) {
-		return;
-	}
-
-	insert_bookmark_internal (bookmarks, g_object_ref (bookmark), -1);
-	nautilus_bookmark_list_save_file (bookmarks);
-}
-
-/**
- * nautilus_bookmark_list_delete_item_at:
- * 
- * Delete the bookmark at the specified position.
- * @bookmarks: the list of bookmarks.
- * @index: index, must be less than length of list.
- **/
-void
-nautilus_bookmark_list_delete_item_at (NautilusBookmarkList *bookmarks, 
-				       guint                 index)
-{
-	GList *doomed;
-
-	g_return_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks));
-	g_return_if_fail (index < g_list_length (bookmarks->list));
-
-	doomed = g_list_nth (bookmarks->list, index);
-	bookmarks->list = g_list_remove_link (bookmarks->list, doomed);
-
-	g_assert (NAUTILUS_IS_BOOKMARK (doomed->data));
-	stop_monitoring_bookmark (bookmarks, NAUTILUS_BOOKMARK (doomed->data));
-	g_object_unref (doomed->data);
-
-	g_list_free_1 (doomed);
-
-	nautilus_bookmark_list_save_file (bookmarks);
-}
-
-/**
- * nautilus_bookmark_list_move_item:
- *
- * Move the item from the given position to the destination.
- * @index: the index of the first bookmark.
- * @destination: the index of the second bookmark.
- **/
-void
-nautilus_bookmark_list_move_item (NautilusBookmarkList *bookmarks,
-				  guint index,
-				  guint destination)
-{
-	GList *bookmark_item;
-
-	if (index == destination) {
-		return;
-	}
-
-	bookmark_item = g_list_nth (bookmarks->list, index);
-	bookmarks->list = g_list_remove_link (bookmarks->list,
-					      bookmark_item);
-
-	bookmarks->list = g_list_insert (bookmarks->list,
-					 bookmark_item->data,
-					 destination);
-
-	nautilus_bookmark_list_save_file (bookmarks);
-}
-
-/**
- * nautilus_bookmark_list_insert_item:
- * 
- * Insert a bookmark at a specified position.
- * @bookmarks: the list of bookmarks.
- * @index: the position to insert the bookmark at.
- * @new_bookmark: the bookmark to insert a copy of.
- **/
-void
-nautilus_bookmark_list_insert_item (NautilusBookmarkList *bookmarks,
-				    NautilusBookmark     *new_bookmark,
-				    guint                 index)
-{
-	g_return_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks));
-	g_return_if_fail (index <= g_list_length (bookmarks->list));
-
-	insert_bookmark_internal (bookmarks, g_object_ref (new_bookmark), index);
-	nautilus_bookmark_list_save_file (bookmarks);
-}
-
-/**
- * nautilus_bookmark_list_item_at:
- * 
- * Get the bookmark at the specified position.
- * @bookmarks: the list of bookmarks.
- * @index: index, must be less than length of list.
- * 
- * Return value: the bookmark at position @index in @bookmarks.
- **/
-NautilusBookmark *
-nautilus_bookmark_list_item_at (NautilusBookmarkList *bookmarks, guint index)
-{
-	g_return_val_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks), NULL);
-	g_return_val_if_fail (index < g_list_length (bookmarks->list), NULL);
-
-	return NAUTILUS_BOOKMARK (g_list_nth_data (bookmarks->list, index));
-}
-
-/**
  * nautilus_bookmark_list_item_with_location:
  *
  * Get the bookmark with the specified location, if any
@@ -404,19 +286,26 @@ nautilus_bookmark_list_item_with_location (NautilusBookmarkList *bookmarks,
 }
 
 /**
- * nautilus_bookmark_list_length:
- * 
- * Get the number of bookmarks in the list.
- * @bookmarks: the list of bookmarks.
- * 
- * Return value: the length of the bookmark list.
+ * nautilus_bookmark_list_append:
+ *
+ * Append a bookmark to a bookmark list.
+ * @bookmarks: NautilusBookmarkList to append to.
+ * @bookmark: Bookmark to append a copy of.
  **/
-guint
-nautilus_bookmark_list_length (NautilusBookmarkList *bookmarks)
+void
+nautilus_bookmark_list_append (NautilusBookmarkList *bookmarks,
+			       NautilusBookmark     *bookmark)
 {
-	g_return_val_if_fail (NAUTILUS_IS_BOOKMARK_LIST(bookmarks), 0);
+	g_return_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks));
+	g_return_if_fail (NAUTILUS_IS_BOOKMARK (bookmark));
 
-	return g_list_length (bookmarks->list);
+	if (g_list_find_custom (bookmarks->list, bookmark,
+				nautilus_bookmark_compare_with) != NULL) {
+		return;
+	}
+
+	insert_bookmark_internal (bookmarks, g_object_ref (bookmark), -1);
+	nautilus_bookmark_list_save_file (bookmarks);
 }
 
 static void
diff --git a/src/nautilus-bookmark-list.h b/src/nautilus-bookmark-list.h
index 3faf15b2a..b5bab0b67 100644
--- a/src/nautilus-bookmark-list.h
+++ b/src/nautilus-bookmark-list.h
@@ -62,20 +62,9 @@ GType                   nautilus_bookmark_list_get_type            (void);
 NautilusBookmarkList *  nautilus_bookmark_list_new                 (void);
 void                    nautilus_bookmark_list_append              (NautilusBookmarkList   *bookmarks,
 								    NautilusBookmark *bookmark);
-void                    nautilus_bookmark_list_delete_item_at      (NautilusBookmarkList   *bookmarks,
-								    guint                   index);
-void                    nautilus_bookmark_list_insert_item         (NautilusBookmarkList   *bookmarks,
-								    NautilusBookmark *bookmark,
-								    guint                   index);
-guint                   nautilus_bookmark_list_length              (NautilusBookmarkList   *bookmarks);
-NautilusBookmark *      nautilus_bookmark_list_item_at             (NautilusBookmarkList   *bookmarks,
-								    guint                   index);
 NautilusBookmark *      nautilus_bookmark_list_item_with_location  (NautilusBookmarkList *bookmarks,
 								    GFile                *location,
 								    guint                *index);
-void                    nautilus_bookmark_list_move_item           (NautilusBookmarkList *bookmarks,
-								    guint                 index,
-								    guint                 destination);
 gboolean                nautilus_bookmark_list_can_bookmark_location (NautilusBookmarkList *list,
 								      GFile                *location);
 GList *                 nautilus_bookmark_list_get_all             (NautilusBookmarkList   *bookmarks);
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
deleted file mode 100644
index c081d91a8..000000000
--- a/src/nautilus-bookmarks-window.c
+++ /dev/null
@@ -1,906 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/*
- * Nautilus
- *
- * Copyright (C) 1999, 2000 Eazel, Inc.
- *
- * Nautilus is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Nautilus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: John Sullivan <sullivan@eazel.com>
- */
-
-/* nautilus-bookmarks-window.c - implementation of bookmark-editing window.
- */
-
-#include <config.h>
-
-#include "nautilus-application.h"
-#include "nautilus-bookmarks-window.h"
-#include "nautilus-window.h"
-
-#include <libnautilus-private/nautilus-entry.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <gdk/gdkkeysyms.h>
-
-/* We store a pointer to the bookmark in a column so when an item is moved
-   with DnD we know which item it is. However we have to be careful to keep
-   this in sync with the actual bookmark. Note that
-   nautilus_bookmark_list_insert_item() makes a copy of the bookmark, so we
-   have to fetch the new copy and update our pointer. */
-
-enum {
-	BOOKMARK_LIST_COLUMN_ICON,
-	BOOKMARK_LIST_COLUMN_NAME,
-	BOOKMARK_LIST_COLUMN_BOOKMARK,
-	BOOKMARK_LIST_NUM_COLUMNS
-};
-
-/* Larger size initially; user can stretch or shrink (but not shrink below min) */
-#define BOOKMARKS_WINDOW_INITIAL_WIDTH	500
-#define BOOKMARKS_WINDOW_INITIAL_HEIGHT	400
-
-G_DEFINE_TYPE (NautilusBookmarksWindow, nautilus_bookmarks_window, GTK_TYPE_WINDOW)
-
-enum {
-	PROP_PARENT_WINDOW = 1,
-	NUM_PROPERTIES
-};
-
-static GParamSpec* properties[NUM_PROPERTIES] = { NULL, };
-
-struct NautilusBookmarksWindowPrivate {
-	NautilusWindow *parent_window;
-
-	NautilusBookmarkList *bookmarks;
-	gulong bookmarks_changed_id;
-
-	GtkTreeView *tree_view;
-	GtkTreeSelection *selection;
-	gulong row_activated_id;
-	gulong button_press_id;
-	gulong key_press_id;
-	gulong selection_changed_id;
-
-	GtkListStore *model;
-	gulong row_changed_id;
-	gulong row_deleted_id;
-
-	GtkWidget *name_field;
-	GtkWidget *uri_field;
-	gulong name_changed_id;
-	gulong uri_changed_id;
-	gboolean text_changed;
-
-	GtkWidget *remove_button;
-	GtkWidget *up_button;
-	GtkWidget *down_button;
-};
-
-static gboolean
-get_selection_exists (NautilusBookmarksWindow *self)
-{
-	return gtk_tree_selection_get_selected (self->priv->selection, NULL, NULL);
-}
-
-static guint
-get_selected_row (NautilusBookmarksWindow *self)
-{
-	GtkTreeIter       iter;
-	GtkTreePath      *path;
-	GtkTreeModel     *model;
-	gint		 *indices, row;
-	
-	if (!gtk_tree_selection_get_selected (self->priv->selection, &model, &iter)) {
-		g_assert_not_reached ();
-	}
-	
-	path = gtk_tree_model_get_path (model, &iter);
-	indices = gtk_tree_path_get_indices (path);
-	row = indices[0];
-	gtk_tree_path_free (path);
-	return row;
-}
-
-static NautilusBookmark *
-get_selected_bookmark (NautilusBookmarksWindow *self)
-{
-	if (!get_selection_exists (self)) {
-		return NULL;
-	}
-
-	if (nautilus_bookmark_list_length (self->priv->bookmarks) < 1) {
-		return NULL;
-	}
-
-	return nautilus_bookmark_list_item_at (self->priv->bookmarks,
-					       get_selected_row (self));
-}
-
-static int
-nautilus_bookmarks_window_key_press_event_cb (GtkWindow *window, 
-					      GdkEventKey *event, 
-					      gpointer user_data)
-{
-	if (event->state & GDK_CONTROL_MASK && event->keyval == GDK_KEY_w) {
-		gtk_widget_destroy (GTK_WIDGET (window));
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static GtkListStore *
-create_bookmark_store (void)
-{
-	return gtk_list_store_new (BOOKMARK_LIST_NUM_COLUMNS,
-				   G_TYPE_ICON,
-				   G_TYPE_STRING,
-				   G_TYPE_OBJECT);
-}
-
-static void
-setup_empty_list (NautilusBookmarksWindow *self)
-{
-	GtkListStore *empty_model;
-	GtkTreeIter iter;
-
-	empty_model = create_bookmark_store ();
-	gtk_list_store_append (empty_model, &iter);
-
-	gtk_list_store_set (empty_model, &iter,
-			    BOOKMARK_LIST_COLUMN_NAME, _("No bookmarks defined"),
-			    -1);
-	gtk_tree_view_set_model (self->priv->tree_view,
-				 GTK_TREE_MODEL (empty_model));
-
-	g_object_unref (empty_model);
-}
-
-static void
-update_widgets_sensitivity (NautilusBookmarksWindow *self)
-{
-	NautilusBookmark *selected;
-	int n_active;
-	int index = -1;
-	gboolean builtin;
-
-	selected = get_selected_bookmark (self);
-	n_active = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (self->priv->model), NULL);
-	if (selected != NULL) {
-		index = get_selected_row (self);
-		builtin = nautilus_bookmark_get_is_builtin (selected);
-	} else {
-		builtin = FALSE;
-	}
-
-	/* Set the sensitivity of widgets that require a selection */
-	gtk_widget_set_sensitive (self->priv->remove_button, !builtin && index >= 0 && n_active > 1);
-	gtk_widget_set_sensitive (self->priv->up_button, !builtin && index > 0);
-	gtk_widget_set_sensitive (self->priv->down_button, !builtin && index >= 0 && index < n_active - 1);
-	gtk_widget_set_sensitive (self->priv->name_field, selected != NULL);
-	gtk_widget_set_sensitive (self->priv->uri_field, selected != NULL);
-}
-
-static void
-on_selection_changed (GtkTreeSelection *treeselection,
-		      gpointer user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-	NautilusBookmark *selected;
-	const char *name = NULL;
-	char *entry_text = NULL;
-	GFile *location;
-
-	selected = get_selected_bookmark (self);
-
-	if (selected) {
-		name = nautilus_bookmark_get_name (selected);
-		location = nautilus_bookmark_get_location (selected);
-		entry_text = g_file_get_parse_name (location);
-
-		g_object_unref (location);
-	}
-
-	update_widgets_sensitivity (self);
-
-	g_signal_handler_block (self->priv->name_field, self->priv->name_changed_id);
-	nautilus_entry_set_text (NAUTILUS_ENTRY (self->priv->name_field),
-				 name ? name : "");
-	g_signal_handler_unblock (self->priv->name_field, self->priv->name_changed_id);
-
-	g_signal_handler_block (self->priv->uri_field, self->priv->uri_changed_id);
-	nautilus_entry_set_text (NAUTILUS_ENTRY (self->priv->uri_field),
-				 entry_text ? entry_text : "");
-	g_signal_handler_unblock (self->priv->uri_field, self->priv->uri_changed_id);
-
-	self->priv->text_changed = FALSE;
-
-	g_free (entry_text);
-}
-
-static void
-bookmarks_set_empty (NautilusBookmarksWindow *self,
-		     gboolean empty)
-{
-	GtkTreeIter iter;
-
-	if (empty) {
-		setup_empty_list (self);
-		gtk_widget_set_sensitive (GTK_WIDGET (self->priv->tree_view), FALSE);
-	} else {
-		gtk_tree_view_set_model (self->priv->tree_view, GTK_TREE_MODEL (self->priv->model));
-		gtk_widget_set_sensitive (GTK_WIDGET (self->priv->tree_view), TRUE);
-
-		if (nautilus_bookmark_list_length (self->priv->bookmarks) > 0 &&
-		    !get_selection_exists (self)) {
-			gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (self->priv->model),
-						       &iter, NULL, 0);
-			gtk_tree_selection_select_iter (self->priv->selection, &iter);
-		}
-	}
-
-	on_selection_changed (self->priv->selection, self);
-}
-
-static void
-repopulate (NautilusBookmarksWindow *self)
-{
-	NautilusBookmark *selected;
-	GtkListStore *store;
-	GtkTreePath *path;
-	GtkTreeRowReference *reference;
-	guint index;
-
-	selected = get_selected_bookmark (self);
-
-	g_signal_handler_block (self->priv->selection, self->priv->selection_changed_id);
-	g_signal_handler_block (self->priv->model, self->priv->row_deleted_id);
-        g_signal_handler_block (self->priv->tree_view, self->priv->row_activated_id);
-        g_signal_handler_block (self->priv->tree_view, self->priv->key_press_id);
-        g_signal_handler_block (self->priv->tree_view, self->priv->button_press_id);
-
-	gtk_list_store_clear (self->priv->model);
-
-	g_signal_handler_unblock (self->priv->selection, self->priv->selection_changed_id);
-	g_signal_handler_unblock (self->priv->model, self->priv->row_deleted_id);
-        g_signal_handler_unblock (self->priv->tree_view, self->priv->row_activated_id);
-        g_signal_handler_unblock (self->priv->tree_view, self->priv->key_press_id);
-        g_signal_handler_unblock (self->priv->tree_view, self->priv->button_press_id);
-
-	/* Fill the list in with the bookmark names. */
-	g_signal_handler_block (self->priv->model, self->priv->row_changed_id);
-
-	reference = NULL;
-	store = self->priv->model;
-
-	for (index = 0; index < nautilus_bookmark_list_length (self->priv->bookmarks); ++index) {
-		NautilusBookmark *bookmark;
-		const char       *bookmark_name;
-		GIcon            *bookmark_icon;
-		GtkTreeIter       iter;
-
-		bookmark = nautilus_bookmark_list_item_at (self->priv->bookmarks, index);
-		bookmark_name = nautilus_bookmark_get_name (bookmark);
-		bookmark_icon = nautilus_bookmark_get_symbolic_icon (bookmark);
-
-		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter, 
-				    BOOKMARK_LIST_COLUMN_ICON, bookmark_icon,
-				    BOOKMARK_LIST_COLUMN_NAME, bookmark_name,
-				    BOOKMARK_LIST_COLUMN_BOOKMARK, bookmark,
-				    -1);
-
-		if (bookmark == selected) {
-			/* save old selection */
-			GtkTreePath *path;
-
-			path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
-			reference = gtk_tree_row_reference_new (GTK_TREE_MODEL (store), path);
-			gtk_tree_path_free (path);
-		}
-
-		g_object_unref (bookmark_icon);
-	}
-
-	g_signal_handler_unblock (self->priv->model, self->priv->row_changed_id);
-
-	if (reference != NULL) {
-		/* restore old selection */
-
-		/* bookmarks_set_empty() will call the selection change handler,
- 		 * so we block it here in case of selection change.
- 		 */
-		g_signal_handler_block (self->priv->selection, self->priv->selection_changed_id);
-
-		g_assert (index != 0);
-		g_assert (gtk_tree_row_reference_valid (reference));
-
-		path = gtk_tree_row_reference_get_path (reference);
-		gtk_tree_selection_select_path (self->priv->selection, path);
-		gtk_tree_row_reference_free (reference);
-		gtk_tree_path_free (path);
-
-		g_signal_handler_unblock (self->priv->selection, self->priv->selection_changed_id);
-	}
-
-	bookmarks_set_empty (self, (index == 0));
-}
-
-static void
-on_bookmark_list_changed (NautilusBookmarkList *bookmarks,
-			  gpointer user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-
-	/* maybe add logic here or in repopulate to save/restore selection */
-	repopulate (self);
-}
-
-static void
-on_name_field_changed (GtkEditable *editable,
-		       gpointer     user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-	GtkTreeIter   iter;
-
-	if (!get_selection_exists(self)) {
-		return;
-	}
-
-	/* Update text displayed in list instantly. Also remember that 
-	 * user has changed text so we update real bookmark later. 
-	 */
-	gtk_tree_selection_get_selected (self->priv->selection, NULL, &iter);
-	gtk_list_store_set (self->priv->model,
-			    &iter, BOOKMARK_LIST_COLUMN_NAME, 
-			    gtk_entry_get_text (GTK_ENTRY (self->priv->name_field)),
-			    -1);
-
-	self->priv->text_changed = TRUE;
-}
-
-static void
-bookmarks_delete_bookmark (NautilusBookmarksWindow *self)
-{
-	GtkTreeIter iter;
-	GtkTreePath *path;
-	gint *indices, row, rows;
-	
-	if (!gtk_tree_selection_get_selected (self->priv->selection, NULL, &iter)) {
-		return;
-	}
-
-	/* Remove the selected item from the list store. on_row_deleted() will
-	   remove it from the bookmark list. */
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (self->priv->model), &iter);
-	indices = gtk_tree_path_get_indices (path);
-	row = indices[0];
-	gtk_tree_path_free (path);
-
-	gtk_list_store_remove (self->priv->model, &iter);
-
-	/* Try to select the same row, or the last one in the list. */
-	rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (self->priv->model), NULL);
-	if (row >= rows) {
-		row = rows - 1;
-	}
-
-	if (row < 0) {
-		bookmarks_set_empty (self, TRUE);
-	} else {
-		gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (self->priv->model),
-					       &iter, NULL, row);
-		gtk_tree_selection_select_iter (self->priv->selection, &iter);
-	}
-}
-
-static void
-on_remove_button_clicked (GtkButton *button,
-                          gpointer   user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-        bookmarks_delete_bookmark (self);
-}
-
-static void
-on_up_button_clicked (GtkButton *button,
-		      gpointer   user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-	guint row;
-	GtkTreeIter iter;
-
-	row = get_selected_row (self);
-	nautilus_bookmark_list_move_item (self->priv->bookmarks, row, row - 1);
-	gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (self->priv->model),
-				       &iter, NULL, row - 1);
-	gtk_tree_selection_select_iter (self->priv->selection, &iter);
-}
-
-static void
-on_down_button_clicked (GtkButton *button,
-			gpointer   user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-	guint row;
-	GtkTreeIter iter;
-
-	row = get_selected_row (self);
-	nautilus_bookmark_list_move_item (self->priv->bookmarks, row, row + 1);
-	gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (self->priv->model),
-				       &iter, NULL, row + 1);
-	gtk_tree_selection_select_iter (self->priv->selection, &iter);
-}
-
-/* This is a bit of a kludge to get DnD to work. We check if the row in the
-   GtkListStore matches the one in the bookmark list. If it doesn't, we assume
-   the bookmark has just been dragged here and we insert it into the bookmark
-   list. */
-static void
-on_row_changed (GtkListStore *store,
-		GtkTreePath *path,
-		GtkTreeIter *iter,
-		gpointer user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-	NautilusBookmark *bookmark = NULL, *bookmark_in_list;
-	gint *indices, row;
-	gboolean insert_bookmark = TRUE;
-
-	indices = gtk_tree_path_get_indices (path);
-	row = indices[0];
-	gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
-			    BOOKMARK_LIST_COLUMN_BOOKMARK, &bookmark,
-			    -1);
-
-	/* If the bookmark in the list doesn't match the changed one, it must
-	   have been dragged here, so we insert it into the list. */
-	if (row < (gint) nautilus_bookmark_list_length (self->priv->bookmarks)) {
-		bookmark_in_list = nautilus_bookmark_list_item_at (self->priv->bookmarks, row);
-		if (bookmark_in_list == bookmark)
-			insert_bookmark = FALSE;
-	}
-
-	if (insert_bookmark) {
-		g_signal_handler_block (self->priv->bookmarks,
-					self->priv->bookmarks_changed_id);
-		nautilus_bookmark_list_insert_item (self->priv->bookmarks,
-						    bookmark, row);
-		g_signal_handler_unblock (self->priv->bookmarks,
-					  self->priv->bookmarks_changed_id);
-
-		/* The bookmark will be copied when inserted into the list, so
-		   we have to update the pointer in the list store. */
-		bookmark = nautilus_bookmark_list_item_at (self->priv->bookmarks, row);
-		g_signal_handler_block (store, self->priv->row_changed_id);
-		gtk_list_store_set (store, iter,
-				    BOOKMARK_LIST_COLUMN_BOOKMARK, bookmark,
-				    -1);
-		g_signal_handler_unblock (store, self->priv->row_changed_id);
-	}
-}
-
-static void
-update_bookmark_from_text (NautilusBookmarksWindow *self)
-{
-	NautilusBookmark *bookmark, *bookmark_in_list;
-	const char *name;
-	GIcon *icon;
-	guint selected_row;
-	GtkTreeIter iter;
-	GFile *location;
-
-	if (!self->priv->text_changed ||
-	    gtk_entry_get_text_length (GTK_ENTRY (self->priv->uri_field)) == 0) {
-		return;
-	}
-
-	location = g_file_parse_name 
-		(gtk_entry_get_text (GTK_ENTRY (self->priv->uri_field)));
-
-	bookmark = nautilus_bookmark_new (location,
-					  gtk_entry_get_text (GTK_ENTRY (self->priv->name_field)));
-
-	g_object_unref (location);
-
-	selected_row = get_selected_row (self);
-
-	/* turn off list updating 'cuz otherwise the list-reordering code runs
-	 * after repopulate(), thus reordering the correctly-ordered list.
-	 */
-	g_signal_handler_block (self->priv->bookmarks, self->priv->bookmarks_changed_id);
-	nautilus_bookmark_list_delete_item_at (self->priv->bookmarks, selected_row);
-	nautilus_bookmark_list_insert_item (self->priv->bookmarks, bookmark, selected_row);
-	g_signal_handler_unblock (self->priv->bookmarks, self->priv->bookmarks_changed_id);
-	g_object_unref (bookmark);
-
-	/* We also have to update the bookmark pointer in the list
-	   store. */
-	gtk_tree_selection_get_selected (self->priv->selection, NULL, &iter);
-	g_signal_handler_block (self->priv->model, self->priv->row_changed_id);
-
-	bookmark_in_list = nautilus_bookmark_list_item_at (self->priv->bookmarks, selected_row);
-	name = nautilus_bookmark_get_name (bookmark_in_list);
-	icon = nautilus_bookmark_get_symbolic_icon (bookmark_in_list);
-
-	gtk_list_store_set (self->priv->model, &iter,
-			    BOOKMARK_LIST_COLUMN_BOOKMARK, bookmark_in_list,
-			    BOOKMARK_LIST_COLUMN_NAME, name,
-			    BOOKMARK_LIST_COLUMN_ICON, icon,
-			    -1);
-
-	g_signal_handler_unblock (self->priv->model, self->priv->row_changed_id);
-	g_object_unref (icon);
-}
-
-/* The update_bookmark_from_text() calls in the
- * on_button_pressed() and on_key_pressed() handlers
- * of the tree view are a hack.
- *
- * The purpose is to track selection changes to the view
- * and write the text fields back before the selection
- * actually changed.
- *
- * Note that the focus-out event of the text entries is emitted
- * after the selection changed, else this would not not be neccessary.
- */
-
-static gboolean
-on_button_pressed (GtkTreeView *view,
-		   GdkEventButton *event,
-		   gpointer user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-	update_bookmark_from_text (self);
-
-	return FALSE;
-}
-
-static gboolean
-on_key_pressed (GtkTreeView *view,
-                GdkEventKey *event,
-                gpointer user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-
-        if (event->keyval == GDK_KEY_Delete || event->keyval == GDK_KEY_KP_Delete) {
-                bookmarks_delete_bookmark (self);
-                return TRUE;
-        }
-
-	update_bookmark_from_text (self);
-
-        return FALSE;
-}
-
-static void
-on_row_activated (GtkTreeView       *view,
-                  GtkTreePath       *path,
-                  GtkTreeViewColumn *column,
-                  gpointer           user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-	NautilusBookmark *selected;
-	GFile *location;
-
-	selected = get_selected_bookmark (self);
-
-	if (!selected) {
-		return;
-	}
-
-	location = nautilus_bookmark_get_location (selected);
-	if (location == NULL) {
-		return;
-	}
-
-        nautilus_application_open_location_full (NAUTILUS_APPLICATION (g_application_get_default ()),
-                                                 location, 0, NULL, NULL, NULL);
-	g_object_unref (location);
-}
-
-static void
-on_row_deleted (GtkListStore *store,
-		GtkTreePath *path,
-		gpointer user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-	gint *indices, row;
-
-	indices = gtk_tree_path_get_indices (path);
-	row = indices[0];
-
-	g_signal_handler_block (self->priv->bookmarks, self->priv->bookmarks_changed_id);
-	nautilus_bookmark_list_delete_item_at (self->priv->bookmarks, row);
-	g_signal_handler_unblock (self->priv->bookmarks, self->priv->bookmarks_changed_id);
-}
-
-static gboolean
-on_text_field_focus_out_event (GtkWidget *widget,
-			       GdkEventFocus *event,
-			       gpointer user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-	update_bookmark_from_text (self);
-
-	return FALSE;
-}
-
-static void
-name_or_uri_field_activate (NautilusEntry *entry,
-			    gpointer user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-
-	update_bookmark_from_text (self);
-	nautilus_entry_select_all_at_idle (entry);
-}
-
-static void
-on_uri_field_changed (GtkEditable *editable,
-		      gpointer user_data)
-{
-	NautilusBookmarksWindow *self = user_data;
-
-	/* Remember that user has changed text so we 
-	 * update real bookmark later. 
-	 */
-	self->priv->text_changed = TRUE;
-}
-
-static void
-nautilus_bookmarks_window_dispose (GObject *object)
-{
-	NautilusBookmarksWindow *self = NAUTILUS_BOOKMARKS_WINDOW (object);
-
-	if (self->priv->bookmarks_changed_id != 0) {
-		g_signal_handler_disconnect (self->priv->bookmarks,
-					     self->priv->bookmarks_changed_id);
-		self->priv->bookmarks_changed_id = 0;
-	}
-
-	g_clear_object (&self->priv->model);
-
-	G_OBJECT_CLASS (nautilus_bookmarks_window_parent_class)->dispose (object);
-}
-
-static void
-nautilus_bookmarks_window_constructed (GObject *object)
-{
-	NautilusBookmarksWindow *self = NAUTILUS_BOOKMARKS_WINDOW (object);
-	GtkBuilder *builder;
-	GError *error = NULL;
-	GtkWindow *window;
-	GtkWidget *content;
-	GtkWidget *headerbar;
-	GtkTreeViewColumn *col;
-	GtkCellRenderer *rend;
-
-	G_OBJECT_CLASS (nautilus_bookmarks_window_parent_class)->constructed (object);
-
-	builder = gtk_builder_new ();
-	if (!gtk_builder_add_from_resource (builder,
-					    "/org/gnome/nautilus/ui/nautilus-bookmarks-window.ui",
-					    &error)) {
-		g_object_unref (builder);
-
-		g_critical ("Can't load UI description for the bookmarks editor: %s", error->message);
-		g_error_free (error);
-		return;
-	}
-
-	headerbar = gtk_header_bar_new ();
-	gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE);
-	gtk_widget_show (headerbar);
-
-	window = GTK_WINDOW (object);
-	gtk_window_set_title (window, _("Bookmarks"));
-	gtk_window_set_titlebar (window,  headerbar);
-	gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG);
-	gtk_window_set_default_size (window, 
-				     BOOKMARKS_WINDOW_INITIAL_WIDTH, 
-				     BOOKMARKS_WINDOW_INITIAL_HEIGHT);
-	gtk_window_set_application (window,
-				    gtk_window_get_application (GTK_WINDOW (self->priv->parent_window)));
-
-	gtk_window_set_destroy_with_parent (window, TRUE);
-	gtk_window_set_transient_for (window, GTK_WINDOW (self->priv->parent_window));
-	gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT);
-	gtk_container_set_border_width (GTK_CONTAINER (window), 6);
-
-	g_signal_connect (window, "key-press-event",
-			  G_CALLBACK (nautilus_bookmarks_window_key_press_event_cb), NULL);
-
-	content = GTK_WIDGET (gtk_builder_get_object (builder, "bookmarks_window_content"));
-	gtk_container_add (GTK_CONTAINER (window), content);
-
-	/* tree view */
-	self->priv->tree_view = GTK_TREE_VIEW (gtk_builder_get_object (builder, "bookmark_tree_view"));
-	self->priv->selection = gtk_tree_view_get_selection (self->priv->tree_view);
-	gtk_tree_selection_set_mode (self->priv->selection, GTK_SELECTION_BROWSE);
-
-	rend = gtk_cell_renderer_pixbuf_new ();
-	g_object_set (rend, "follow-state", TRUE, NULL);
-	col = gtk_tree_view_column_new_with_attributes ("Icon", 
-							rend,
-							"gicon", 
-							BOOKMARK_LIST_COLUMN_ICON,
-							NULL);
-	gtk_tree_view_append_column (self->priv->tree_view,
-				     GTK_TREE_VIEW_COLUMN (col));
-	gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (col),
-					      NAUTILUS_LIST_ICON_SIZE_SMALL);
-
-	rend = gtk_cell_renderer_text_new ();
-	g_object_set (rend,
-		      "ellipsize", PANGO_ELLIPSIZE_END,
-		      "ellipsize-set", TRUE,
-		      NULL);
-
-	col = gtk_tree_view_column_new_with_attributes ("Icon", 
-							rend,
-							"text", 
-							BOOKMARK_LIST_COLUMN_NAME,
-							NULL);
-	gtk_tree_view_append_column (self->priv->tree_view,
-				     GTK_TREE_VIEW_COLUMN (col));
-
-	self->priv->model = create_bookmark_store ();
-	setup_empty_list (self);
-
-	/* name entry */
-	self->priv->name_field = nautilus_entry_new ();
-	gtk_widget_show (self->priv->name_field);
-	gtk_box_pack_start (GTK_BOX (gtk_builder_get_object (builder, "bookmark_name_placeholder")),
-			    self->priv->name_field, TRUE, TRUE, 0);
-	
-	gtk_label_set_mnemonic_widget (
-		GTK_LABEL (gtk_builder_get_object (builder, "bookmark_name_label")),
-		self->priv->name_field);
-
-	/* URI entry */
-	self->priv->uri_field = nautilus_entry_new ();
-	gtk_widget_show (self->priv->uri_field);
-	gtk_box_pack_start (GTK_BOX (gtk_builder_get_object (builder, "bookmark_location_placeholder")),
-			    self->priv->uri_field, TRUE, TRUE, 0);
-
-	gtk_label_set_mnemonic_widget (
-		GTK_LABEL (gtk_builder_get_object (builder, "bookmark_location_label")),
-		self->priv->uri_field);
-
-	/* buttons */
-	self->priv->remove_button = GTK_WIDGET (gtk_builder_get_object (builder, "bookmark_remove_button"));
-	self->priv->up_button = GTK_WIDGET (gtk_builder_get_object (builder, "bookmark_up_button"));
-	self->priv->down_button = GTK_WIDGET (gtk_builder_get_object (builder, "bookmark_down_button"));
-
-	g_object_unref (builder);
-
-	/* setup bookmarks list and signals */
-	self->priv->bookmarks = nautilus_application_get_bookmarks
-		(NAUTILUS_APPLICATION (g_application_get_default ()));
-	self->priv->bookmarks_changed_id =
-		g_signal_connect (self->priv->bookmarks, "changed",
-				  G_CALLBACK (on_bookmark_list_changed), self);
-
-	self->priv->row_changed_id =
-		g_signal_connect (self->priv->model, "row-changed",
-				  G_CALLBACK (on_row_changed), self);
-	self->priv->row_deleted_id =
-		g_signal_connect (self->priv->model, "row-deleted",
-				  G_CALLBACK (on_row_deleted), self);
-
-        self->priv->row_activated_id =
-                g_signal_connect (self->priv->tree_view, "row-activated",
-                                  G_CALLBACK (on_row_activated), self);
-        self->priv->button_press_id =
-                g_signal_connect (self->priv->tree_view, "button-press-event",
-                                  G_CALLBACK (on_button_pressed), self);
-        self->priv->key_press_id =
-                g_signal_connect (self->priv->tree_view, "key-press-event",
-                                  G_CALLBACK (on_key_pressed), self);
-	self->priv->selection_changed_id =
-		g_signal_connect (self->priv->selection, "changed",
-				  G_CALLBACK (on_selection_changed), self);
-
-	self->priv->name_changed_id =
-		g_signal_connect (self->priv->name_field, "changed",
-				  G_CALLBACK (on_name_field_changed), self);
-	g_signal_connect (self->priv->name_field, "focus-out-event",
-			  G_CALLBACK (on_text_field_focus_out_event), self);
-	g_signal_connect (self->priv->name_field, "activate",
-			  G_CALLBACK (name_or_uri_field_activate), self);
-
-	self->priv->uri_changed_id =
-		g_signal_connect (self->priv->uri_field, "changed",
-				  G_CALLBACK (on_uri_field_changed), self);
-	g_signal_connect (self->priv->uri_field, "focus-out-event",
-			  G_CALLBACK (on_text_field_focus_out_event), self);
-	g_signal_connect (self->priv->uri_field, "activate",
-			  G_CALLBACK (name_or_uri_field_activate), self);
-
-	g_signal_connect (self->priv->remove_button, "clicked",
-			  G_CALLBACK (on_remove_button_clicked), self);
-	g_signal_connect (self->priv->up_button, "clicked",
-			  G_CALLBACK (on_up_button_clicked), self);
-	g_signal_connect (self->priv->down_button, "clicked",
-			  G_CALLBACK (on_down_button_clicked), self);
-	
-	/* Fill in list widget with bookmarks, must be after signals are wired up. */
-	repopulate (self);
-}
-
-static void
-nautilus_bookmarks_window_set_property (GObject *object,
-					guint arg_id,
-					const GValue *value,
-					GParamSpec *pspec)
-{
-	NautilusBookmarksWindow *self = NAUTILUS_BOOKMARKS_WINDOW (object);
-
-	switch (arg_id) {
-	case PROP_PARENT_WINDOW:
-		self->priv->parent_window = g_value_get_object (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, arg_id, pspec);
-		break;
-	}
-}
-
-static void
-nautilus_bookmarks_window_init (NautilusBookmarksWindow *self)
-{
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, NAUTILUS_TYPE_BOOKMARKS_WINDOW,
-						  NautilusBookmarksWindowPrivate);
-}
-
-static void
-nautilus_bookmarks_window_class_init (NautilusBookmarksWindowClass *klass)
-{
-	GObjectClass *oclass = G_OBJECT_CLASS (klass);
-
-	oclass->set_property = nautilus_bookmarks_window_set_property;
-	oclass->dispose = nautilus_bookmarks_window_dispose;
-	oclass->constructed = nautilus_bookmarks_window_constructed;
-
-	properties[PROP_PARENT_WINDOW] =
-		g_param_spec_object ("parent-window",
-				     "The NautilusWindow",
-				     "The parent NautilusWindow",
-				     NAUTILUS_TYPE_WINDOW,
-				     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
-
-	g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
-	g_type_class_add_private (klass, sizeof (NautilusBookmarksWindowPrivate));
-}
-
-/**
- * nautilus_bookmarks_window_new:
- * 
- * Create a new bookmark-editing window. 
- * @parent_window: The parent NautilusWindow.
- *
- * Return value: A pointer to the new window.
- **/
-GtkWindow *
-nautilus_bookmarks_window_new (NautilusWindow *parent_window)
-{
-	return g_object_new (NAUTILUS_TYPE_BOOKMARKS_WINDOW,
-			     "parent-window", parent_window,
-			     NULL);
-}
diff --git a/src/nautilus-bookmarks-window.h b/src/nautilus-bookmarks-window.h
deleted file mode 100644
index ef4517bf0..000000000
--- a/src/nautilus-bookmarks-window.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/*
- * Nautilus
- *
- * Copyright (C) 1999, 2000 Eazel, Inc.
- *
- * Nautilus is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Nautilus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: John Sullivan <sullivan@eazel.com>
- */
-
-/* nautilus-bookmarks-window.h - interface for bookmark-editing window.
- */
-
-#ifndef NAUTILUS_BOOKMARKS_WINDOW_H
-#define NAUTILUS_BOOKMARKS_WINDOW_H
-
-#include <gtk/gtk.h>
-
-#include "nautilus-window.h"
-#include "nautilus-bookmark-list.h"
-
-#define NAUTILUS_TYPE_BOOKMARKS_WINDOW nautilus_bookmarks_window_get_type()
-#define NAUTILUS_BOOKMARKS_WINDOW(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_BOOKMARKS_WINDOW, NautilusBookmarksWindow))
-#define NAUTILUS_BOOKMARKS_WINDOW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_BOOKMARKS_WINDOW, NautilusBookmarksWindowClass))
-#define NAUTILUS_IS_BOOKMARKS_WINDOW(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_BOOKMARKS_WINDOW))
-#define NAUTILUS_IS_BOOKMARKS_WINDOW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_BOOKMARKS_WINDOW))
-#define NAUTILUS_BOOKMARKS_WINDOW_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_BOOKMARKS_WINDOW, NautilusBookmarksWindowClass))
-
-typedef struct NautilusBookmarksWindowPrivate NautilusBookmarksWindowPrivate;
-
-typedef struct  {
-	GtkWindow parent;
-
-	NautilusBookmarksWindowPrivate *priv;
-} NautilusBookmarksWindow;
-
-typedef struct {
-	GtkWindowClass parent_class;
-} NautilusBookmarksWindowClass;
-
-GType nautilus_bookmarks_window_get_type (void);
-
-GtkWindow *nautilus_bookmarks_window_new (NautilusWindow       *parent_window);
-
-#endif /* NAUTILUS_BOOKMARKS_WINDOW_H */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index a8b5100a4..830b1cffc 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -31,7 +31,6 @@
 #include <config.h>
 
 #include "nautilus-application.h"
-#include "nautilus-bookmarks-window.h"
 #include "nautilus-desktop-window.h"
 #include "nautilus-location-entry.h"
 #include "nautilus-mime-actions.h"
diff --git a/src/resources/ui/nautilus-bookmarks-window.ui b/src/resources/ui/nautilus-bookmarks-window.ui
deleted file mode 100644
index 92d14a3af..000000000
--- a/src/resources/ui/nautilus-bookmarks-window.ui
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkBox" id="bookmarks_window_content">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="spacing">18</property>
-    <child>
-      <object class="GtkBox" id="box1">
-        <property name="width_request">200</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkScrolledWindow" id="bookmark_list_window">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkTreeView" id="bookmark_tree_view">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="headers_visible">False</property>
-                <property name="reorderable">True</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection" id="treeview-selection"/>
-                </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolbar" id="bookmarks_toolbar">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="toolbar_style">icons</property>
-            <property name="icon_size">1</property>
-            <style>
-              <class name="inline-toolbar"/>
-            </style>
-            <child>
-              <object class="GtkToolItem" id="remove_toolitem">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkBox" id="box3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkButton" id="bookmark_remove_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Remove</property>
-                        <child>
-                          <object class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="icon_name">list-remove-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="draw">False</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolItem" id="up_down_toolitem">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkBox" id="box2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkButton" id="bookmark_up_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Move Up</property>
-                        <child>
-                          <object class="GtkImage" id="image3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="icon_name">go-up-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="bookmark_down_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Move Down</property>
-                        <child>
-                          <object class="GtkImage" id="image5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="icon_name">go-down-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="vbox2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="valign">start</property>
-        <property name="hexpand">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">18</property>
-        <child>
-          <object class="GtkBox" id="vbox4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="bookmark_name_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes" context="Bookmark" comments="&quot;Name&quot; is the label on the rigth side of the bookmark window referencing the bookmark name">_Name</property>
-                <property name="use_underline">True</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="hbox3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label">    </property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="bookmark_name_placeholder">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="bookmark_location_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="xpad">2</property>
-                <property name="ypad">2</property>
-                <property name="label" translatable="yes">_Location</property>
-                <property name="use_underline">True</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="hbox2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label">    </property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="bookmark_location_placeholder">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>