[nautilus: 9/10] tree-sidebar: rename and move to src/

[Cosimo Cecchi <cosimoc src gnome org>]

commit 7bce7484e9cf5389582fd70c509abd2541ac04e5
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Dec 3 19:25:06 2010 +0100

    tree-sidebar: rename and move to src/

 src/Makefile.am                                    |    4 ++++
 src/file-manager/Makefile.am                       |    4 ----
 src/nautilus-navigation-window.c                   |    3 +--
 ...-tree-model.c => nautilus-tree-sidebar-model.c} |    7 +++++--
 ...-tree-model.h => nautilus-tree-sidebar-model.h} |    0
 .../fm-tree-view.c => nautilus-tree-sidebar.c}     |   19 +++++++++++--------
 .../fm-tree-view.h => nautilus-tree-sidebar.h}     |    0
 7 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 57d8fae..4254604 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,6 +113,10 @@ nautilus_SOURCES = \
 	nautilus-self-check-functions.h 	\
 	nautilus-spatial-window.c               \
 	nautilus-spatial-window.h               \
+	nautilus-tree-sidebar.c			\
+	nautilus-tree-sidebar.h			\
+	nautilus-tree-sidebar-model.c		\
+	nautilus-tree-sidebar-model.h		\
 	nautilus-trash-bar.c			\
 	nautilus-trash-bar.h			\
 	nautilus-view-as-action.c		\
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index 9d64909..af0353d 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -40,10 +40,6 @@ libnautilus_file_manager_la_SOURCES=	\
 	fm-list-view.h 			\
 	fm-properties-window.c		\
 	fm-properties-window.h 		\
-	fm-tree-model.c			\
-	fm-tree-model.h			\
-	fm-tree-view.c			\
-	fm-tree-view.h			\
 	nautilus-audio-mime-types.h	\
 	$(NULL)
 
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 0664bcc..3e9fbee 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -40,11 +40,10 @@
 #include "nautilus-navigation-window-slot.h"
 #include "nautilus-notebook.h"
 #include "nautilus-places-sidebar.h"
+#include "nautilus-tree-sidebar.h"
 #include "nautilus-window-manage-views.h"
 #include "nautilus-navigation-window-pane.h"
 
-#include "file-manager/fm-tree-view.h"
-
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
diff --git a/src/file-manager/fm-tree-model.c b/src/nautilus-tree-sidebar-model.c
similarity index 99%
rename from src/file-manager/fm-tree-model.c
rename to src/nautilus-tree-sidebar-model.c
index 69143ea..9aed1bb 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/nautilus-tree-sidebar-model.c
@@ -27,13 +27,16 @@
 /* fm-tree-model.c - model for the tree view */
 
 #include <config.h>
-#include "fm-tree-model.h"
+
+#include "nautilus-tree-sidebar-model.h"
 
 #include <eel/eel-gdk-pixbuf-extensions.h>
-#include <glib/gi18n.h>
+
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-file.h>
+
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <string.h>
 
diff --git a/src/file-manager/fm-tree-model.h b/src/nautilus-tree-sidebar-model.h
similarity index 100%
rename from src/file-manager/fm-tree-model.h
rename to src/nautilus-tree-sidebar-model.h
diff --git a/src/file-manager/fm-tree-view.c b/src/nautilus-tree-sidebar.c
similarity index 99%
rename from src/file-manager/fm-tree-view.c
rename to src/nautilus-tree-sidebar.c
index 55ec26f..a1d193a 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/nautilus-tree-sidebar.c
@@ -30,15 +30,12 @@
  */
 
 #include <config.h>
-#include "fm-tree-view.h"
 
-#include "fm-tree-model.h"
-#include "fm-properties-window.h"
-#include <string.h>
-#include <eel/eel-gtk-extensions.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
+#include "nautilus-tree-sidebar.h"
+
+#include "nautilus-tree-sidebar-model.h"
+#include "file-manager/fm-properties-window.h"
+
 #include <libnautilus-private/nautilus-clipboard.h>
 #include <libnautilus-private/nautilus-clipboard-monitor.h>
 #include <libnautilus-private/nautilus-desktop-icon-file.h>
@@ -53,6 +50,12 @@
 #include <libnautilus-private/nautilus-window-info.h>
 #include <libnautilus-private/nautilus-window-slot-info.h>
 
+#include <string.h>
+#include <eel/eel-gtk-extensions.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+
 #define DEBUG_FLAG NAUTILUS_DEBUG_LIST_VIEW
 #include <libnautilus-private/nautilus-debug.h>
 
diff --git a/src/file-manager/fm-tree-view.h b/src/nautilus-tree-sidebar.h
similarity index 100%
rename from src/file-manager/fm-tree-view.h
rename to src/nautilus-tree-sidebar.h