[nautilus/wip/csoriano/private-to-src: 3/3] general: merge libnautilus-private to src
- From: Carlos Soriano Sánchez <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/csoriano/private-to-src: 3/3] general: merge libnautilus-private to src
- Date: Mon, 25 Apr 2016 11:27:05 +0000 (UTC)
commit 3107d34f983bf63bb0aec7b0398075bda5ab35db
Author: Carlos Soriano <csoriano gnome org>
Date: Fri Apr 22 17:02:38 2016 +0200
general: merge libnautilus-private to src
Makefile.am | 1 -
autogen.sh | 3 +-
configure.ac | 1 -
libnautilus-private/Makefile.am | 192 --------------------
libnautilus-private/README | 13 --
nautilus-desktop/Makefile.am | 4 +-
nautilus-desktop/nautilus-desktop-application.c | 2 +-
nautilus-desktop/nautilus-desktop-canvas-view.c | 22 +-
nautilus-desktop/nautilus-desktop-directory-file.c | 12 +-
nautilus-desktop/nautilus-desktop-directory-file.h | 2 +-
nautilus-desktop/nautilus-desktop-directory.c | 10 +-
nautilus-desktop/nautilus-desktop-directory.h | 2 +-
nautilus-desktop/nautilus-desktop-icon-file.c | 16 +-
nautilus-desktop/nautilus-desktop-icon-file.h | 2 +-
nautilus-desktop/nautilus-desktop-link-monitor.c | 6 +-
nautilus-desktop/nautilus-desktop-link.c | 8 +-
nautilus-desktop/nautilus-desktop-link.h | 2 +-
nautilus-desktop/nautilus-desktop-metadata.c | 4 +-
nautilus-desktop/nautilus-desktop-metadata.h | 2 +-
nautilus-desktop/nautilus-desktop-window.c | 6 +-
src/Makefile.am | 128 +++++++++++++-
src/nautilus-application.c | 20 +-
src/nautilus-autorun-software.c | 4 +-
src/nautilus-bookmark-list.c | 6 +-
src/nautilus-bookmark-list.h | 2 +-
{libnautilus-private => src}/nautilus-bookmark.c | 10 +-
{libnautilus-private => src}/nautilus-bookmark.h | 0
.../nautilus-canvas-container.c | 0
.../nautilus-canvas-container.h | 2 +-
{libnautilus-private => src}/nautilus-canvas-dnd.c | 4 +-
{libnautilus-private => src}/nautilus-canvas-dnd.h | 4 +-
.../nautilus-canvas-item.c | 0
.../nautilus-canvas-item.h | 0
.../nautilus-canvas-private.h | 6 +-
src/nautilus-canvas-view-container.c | 6 +-
src/nautilus-canvas-view-container.h | 2 +-
src/nautilus-canvas-view.c | 24 ++--
src/nautilus-canvas-view.h | 2 +-
.../nautilus-clipboard-monitor.c | 0
.../nautilus-clipboard-monitor.h | 0
{libnautilus-private => src}/nautilus-clipboard.c | 0
{libnautilus-private => src}/nautilus-clipboard.h | 0
.../nautilus-column-chooser.c | 0
.../nautilus-column-chooser.h | 2 +-
.../nautilus-column-utilities.c | 2 +-
.../nautilus-column-utilities.h | 2 +-
src/nautilus-dbus-manager.c | 4 +-
{libnautilus-private => src}/nautilus-debug.c | 0
{libnautilus-private => src}/nautilus-debug.h | 0
.../nautilus-default-file-icon.c | 0
.../nautilus-default-file-icon.h | 0
src/nautilus-desktop-item-properties.c | 4 +-
.../nautilus-directory-async.c | 0
.../nautilus-directory-notify.h | 2 +-
.../nautilus-directory-private.h | 8 +-
{libnautilus-private => src}/nautilus-directory.c | 0
{libnautilus-private => src}/nautilus-directory.h | 2 +-
{libnautilus-private => src}/nautilus-dnd.c | 4 +-
{libnautilus-private => src}/nautilus-dnd.h | 0
src/nautilus-empty-view.c | 2 +-
{libnautilus-private => src}/nautilus-entry.c | 0
{libnautilus-private => src}/nautilus-entry.h | 0
src/nautilus-error-reporting.c | 4 +-
src/nautilus-error-reporting.h | 2 +-
.../nautilus-file-attributes.h | 0
.../nautilus-file-changes-queue.c | 0
.../nautilus-file-changes-queue.h | 0
.../nautilus-file-conflict-dialog.c | 0
.../nautilus-file-conflict-dialog.h | 0
.../nautilus-file-operations.c | 0
.../nautilus-file-operations.h | 0
.../nautilus-file-private.h | 8 +-
{libnautilus-private => src}/nautilus-file-queue.c | 0
{libnautilus-private => src}/nautilus-file-queue.h | 2 +-
.../nautilus-file-undo-manager.c | 0
.../nautilus-file-undo-manager.h | 2 +-
.../nautilus-file-undo-operations.c | 0
.../nautilus-file-undo-operations.h | 0
.../nautilus-file-utilities.c | 0
.../nautilus-file-utilities.h | 0
{libnautilus-private => src}/nautilus-file.c | 2 +-
{libnautilus-private => src}/nautilus-file.h | 4 +-
src/nautilus-files-view-dnd.c | 6 +-
src/nautilus-files-view.c | 42 ++--
src/nautilus-files-view.h | 6 +-
src/nautilus-freedesktop-dbus.c | 2 +-
.../nautilus-global-preferences.c | 0
.../nautilus-global-preferences.h | 2 +-
{libnautilus-private => src}/nautilus-icon-info.c | 0
{libnautilus-private => src}/nautilus-icon-info.h | 0
{libnautilus-private => src}/nautilus-icon-names.h | 0
src/nautilus-image-properties-page.c | 2 +-
.../nautilus-keyfile-metadata.c | 0
.../nautilus-keyfile-metadata.h | 2 +-
.../nautilus-lib-self-check-functions.c | 0
.../nautilus-lib-self-check-functions.h | 0
{libnautilus-private => src}/nautilus-link.c | 0
{libnautilus-private => src}/nautilus-link.h | 0
src/nautilus-list-model.c | 2 +-
src/nautilus-list-model.h | 4 +-
src/nautilus-list-view.c | 24 ++--
src/nautilus-location-entry.c | 6 +-
src/nautilus-location-entry.h | 2 +-
src/nautilus-main.c | 2 +-
{libnautilus-private => src}/nautilus-metadata.c | 0
{libnautilus-private => src}/nautilus-metadata.h | 0
src/nautilus-mime-actions.c | 16 +-
src/nautilus-mime-actions.h | 2 +-
.../nautilus-mime-application-chooser.c | 0
.../nautilus-mime-application-chooser.h | 0
{libnautilus-private => src}/nautilus-module.c | 0
{libnautilus-private => src}/nautilus-module.h | 0
{libnautilus-private => src}/nautilus-monitor.c | 0
{libnautilus-private => src}/nautilus-monitor.h | 0
src/nautilus-pathbar.c | 12 +-
src/nautilus-preferences-window.c | 8 +-
src/nautilus-previewer.c | 2 +-
.../nautilus-private-enum-types.c.template | 0
.../nautilus-private-enum-types.h.template | 0
{libnautilus-private => src}/nautilus-profile.c | 0
{libnautilus-private => src}/nautilus-profile.h | 0
.../nautilus-program-choosing.c | 0
.../nautilus-program-choosing.h | 2 +-
.../nautilus-progress-info-manager.c | 0
.../nautilus-progress-info-manager.h | 2 +-
src/nautilus-progress-info-widget.h | 2 +-
.../nautilus-progress-info.c | 0
.../nautilus-progress-info.h | 0
src/nautilus-progress-persistence-handler.c | 4 +-
src/nautilus-properties-window.c | 18 +-
src/nautilus-properties-window.h | 2 +-
src/nautilus-query-editor.c | 6 +-
src/nautilus-query-editor.h | 2 +-
{libnautilus-private => src}/nautilus-query.c | 4 +-
{libnautilus-private => src}/nautilus-query.h | 0
{libnautilus-private => src}/nautilus-recent.c | 0
{libnautilus-private => src}/nautilus-recent.h | 2 +-
.../nautilus-search-directory-file.c | 0
.../nautilus-search-directory-file.h | 2 +-
.../nautilus-search-directory.c | 0
.../nautilus-search-directory.h | 4 +-
.../nautilus-search-engine-model.c | 0
.../nautilus-search-engine-model.h | 2 +-
.../nautilus-search-engine-simple.c | 0
.../nautilus-search-engine-simple.h | 0
.../nautilus-search-engine-tracker.c | 0
.../nautilus-search-engine-tracker.h | 2 +-
.../nautilus-search-engine.c | 0
.../nautilus-search-engine.h | 6 +-
{libnautilus-private => src}/nautilus-search-hit.c | 0
{libnautilus-private => src}/nautilus-search-hit.h | 0
src/nautilus-search-popover.c | 6 +-
src/nautilus-search-popover.h | 2 +-
.../nautilus-search-provider.c | 2 +-
.../nautilus-search-provider.h | 4 +-
.../nautilus-selection-canvas-item.c | 0
.../nautilus-selection-canvas-item.h | 0
src/nautilus-shell-search-provider.c | 10 +-
{libnautilus-private => src}/nautilus-signaller.c | 0
{libnautilus-private => src}/nautilus-signaller.h | 0
{libnautilus-private => src}/nautilus-thumbnails.c | 0
{libnautilus-private => src}/nautilus-thumbnails.h | 2 +-
src/nautilus-toolbar.c | 8 +-
src/nautilus-trash-bar.c | 8 +-
.../nautilus-trash-monitor.c | 0
.../nautilus-trash-monitor.h | 0
.../nautilus-tree-view-drag-dest.c | 0
.../nautilus-tree-view-drag-dest.h | 0
.../nautilus-ui-utilities.c | 0
.../nautilus-ui-utilities.h | 0
.../nautilus-undo-private.h | 4 +-
.../nautilus-vfs-directory.c | 0
.../nautilus-vfs-directory.h | 2 +-
{libnautilus-private => src}/nautilus-vfs-file.c | 0
{libnautilus-private => src}/nautilus-vfs-file.h | 2 +-
.../nautilus-video-mime-types.h | 0
src/nautilus-view.h | 2 +-
src/nautilus-window-slot-dnd.h | 2 +-
src/nautilus-window-slot.c | 14 +-
src/nautilus-window.c | 26 ++--
src/nautilus-window.h | 4 +-
src/nautilus-x-content-bar.c | 6 +-
test/Makefile.am | 5 +-
test/test-copy.c | 6 +-
test/test-nautilus-directory-async.c | 6 +-
test/test-nautilus-mime-actions-set.c | 2 +-
test/test-nautilus-mime-actions.c | 2 +-
test/test-nautilus-search-engine.c | 4 +-
test/test.h | 2 +-
189 files changed, 415 insertions(+), 504 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 17a81e4..acd665e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ DIRS = \
eel \
libnautilus-extension \
libgd \
- libnautilus-private \
src \
test \
po \
diff --git a/autogen.sh b/autogen.sh
index a69af5f..a015908 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,8 +5,7 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
(test -f $srcdir/configure.ac \
- && test -f $srcdir/README \
- && test -d $srcdir/libnautilus-private) || {
+ && test -f $srcdir/README) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
diff --git a/configure.ac b/configure.ac
index 6ed273c..493c5de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -329,7 +329,6 @@ docs/reference/Makefile
docs/reference/libnautilus-extension/Makefile
docs/reference/libnautilus-extension/version.xml
eel/Makefile
-libnautilus-private/Makefile
libnautilus-extension/Makefile
libnautilus-extension/libnautilus-extension.pc
libnautilus-extension/libnautilus-extension-uninstalled.pc
diff --git a/nautilus-desktop/Makefile.am b/nautilus-desktop/Makefile.am
index 524146e..f8d8c0d 100644
--- a/nautilus-desktop/Makefile.am
+++ b/nautilus-desktop/Makefile.am
@@ -6,8 +6,8 @@ bin_PROGRAMS= \
AM_CPPFLAGS = \
-I$(top_srcdir) \
- -I$(top_srcdir)/libnautilus-private \
- -I$(top_builddir)/libnautilus-private \
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src \
-I$(top_srcdir)/libgd \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
diff --git a/nautilus-desktop/nautilus-desktop-application.c b/nautilus-desktop/nautilus-desktop-application.c
index 7622cda..028add6 100644
--- a/nautilus-desktop/nautilus-desktop-application.c
+++ b/nautilus-desktop/nautilus-desktop-application.c
@@ -25,7 +25,7 @@
#include "nautilus-freedesktop-generated.h"
-#include <libnautilus-private/nautilus-global-preferences.h>
+#include <src/nautilus-global-preferences.h>
#include <eel/eel.h>
#include <gdk/gdkx.h>
#include <stdlib.h>
diff --git a/nautilus-desktop/nautilus-desktop-canvas-view.c b/nautilus-desktop/nautilus-desktop-canvas-view.c
index 04731d9..2d4984f 100644
--- a/nautilus-desktop/nautilus-desktop-canvas-view.c
+++ b/nautilus-desktop/nautilus-desktop-canvas-view.c
@@ -39,17 +39,17 @@
#include <fcntl.h>
#include <gdk/gdkx.h>
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-directory-notify.h>
-#include <libnautilus-private/nautilus-file-changes-queue.h>
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-link.h>
-#include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-monitor.h>
-#include <libnautilus-private/nautilus-program-choosing.h>
-#include <libnautilus-private/nautilus-trash-monitor.h>
+#include <src/nautilus-directory-notify.h>
+#include <src/nautilus-file-changes-queue.h>
+#include <src/nautilus-file-operations.h>
+#include <src/nautilus-file-utilities.h>
+#include <src/nautilus-ui-utilities.h>
+#include <src/nautilus-global-preferences.h>
+#include <src/nautilus-link.h>
+#include <src/nautilus-metadata.h>
+#include <src/nautilus-monitor.h>
+#include <src/nautilus-program-choosing.h>
+#include <src/nautilus-trash-monitor.h>
#include <src/nautilus-files-view.h>
#include <limits.h>
#include <stddef.h>
diff --git a/nautilus-desktop/nautilus-desktop-directory-file.c
b/nautilus-desktop/nautilus-desktop-directory-file.c
index ba3cd13..08c98c7 100644
--- a/nautilus-desktop/nautilus-desktop-directory-file.c
+++ b/nautilus-desktop/nautilus-desktop-directory-file.c
@@ -25,12 +25,12 @@
#include "nautilus-desktop-metadata.h"
#include "nautilus-desktop-directory.h"
-#include <libnautilus-private/nautilus-directory-notify.h>
-#include <libnautilus-private/nautilus-directory-private.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-file-private.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-metadata.h>
+#include <src/nautilus-directory-notify.h>
+#include <src/nautilus-directory-private.h>
+#include <src/nautilus-file-attributes.h>
+#include <src/nautilus-file-private.h>
+#include <src/nautilus-file-utilities.h>
+#include <src/nautilus-metadata.h>
#include <eel/eel-glib-extensions.h>
#include <gtk/gtk.h>
diff --git a/nautilus-desktop/nautilus-desktop-directory-file.h
b/nautilus-desktop/nautilus-desktop-directory-file.h
index 2a50979..5813fda 100644
--- a/nautilus-desktop/nautilus-desktop-directory-file.h
+++ b/nautilus-desktop/nautilus-desktop-directory-file.h
@@ -23,7 +23,7 @@
#ifndef NAUTILUS_DESKTOP_DIRECTORY_FILE_H
#define NAUTILUS_DESKTOP_DIRECTORY_FILE_H
-#include <libnautilus-private/nautilus-file.h>
+#include <src/nautilus-file.h>
#define NAUTILUS_TYPE_DESKTOP_DIRECTORY_FILE nautilus_desktop_directory_file_get_type()
#define NAUTILUS_DESKTOP_DIRECTORY_FILE(obj) \
diff --git a/nautilus-desktop/nautilus-desktop-directory.c b/nautilus-desktop/nautilus-desktop-directory.c
index 6a43ec5..0af76e2 100644
--- a/nautilus-desktop/nautilus-desktop-directory.c
+++ b/nautilus-desktop/nautilus-desktop-directory.c
@@ -25,11 +25,11 @@
#include "nautilus-desktop-directory.h"
#include "nautilus-desktop-directory-file.h"
-#include <libnautilus-private/nautilus-directory-private.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-file-private.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
+#include <src/nautilus-directory-private.h>
+#include <src/nautilus-file.h>
+#include <src/nautilus-file-private.h>
+#include <src/nautilus-file-utilities.h>
+#include <src/nautilus-global-preferences.h>
#include <gtk/gtk.h>
struct NautilusDesktopDirectoryDetails {
diff --git a/nautilus-desktop/nautilus-desktop-directory.h b/nautilus-desktop/nautilus-desktop-directory.h
index 9e9dc49..7c357fc 100644
--- a/nautilus-desktop/nautilus-desktop-directory.h
+++ b/nautilus-desktop/nautilus-desktop-directory.h
@@ -24,7 +24,7 @@
#ifndef NAUTILUS_DESKTOP_DIRECTORY_H
#define NAUTILUS_DESKTOP_DIRECTORY_H
-#include <libnautilus-private/nautilus-directory.h>
+#include <src/nautilus-directory.h>
#define NAUTILUS_TYPE_DESKTOP_DIRECTORY nautilus_desktop_directory_get_type()
#define NAUTILUS_DESKTOP_DIRECTORY(obj) \
diff --git a/nautilus-desktop/nautilus-desktop-icon-file.c b/nautilus-desktop/nautilus-desktop-icon-file.c
index 073b813..3afdf8e 100644
--- a/nautilus-desktop/nautilus-desktop-icon-file.c
+++ b/nautilus-desktop/nautilus-desktop-icon-file.c
@@ -26,14 +26,14 @@
#include "nautilus-desktop-directory-file.h"
#include "nautilus-desktop-directory.h"
-#include <libnautilus-private/nautilus-directory-notify.h>
-#include <libnautilus-private/nautilus-directory-private.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-file-private.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-link.h>
-#include <libnautilus-private/nautilus-file-undo-manager.h>
+#include <src/nautilus-directory-notify.h>
+#include <src/nautilus-directory-private.h>
+#include <src/nautilus-file-attributes.h>
+#include <src/nautilus-file-private.h>
+#include <src/nautilus-file-utilities.h>
+#include <src/nautilus-file-operations.h>
+#include <src/nautilus-link.h>
+#include <src/nautilus-file-undo-manager.h>
#include <eel/eel-glib-extensions.h>
#include <glib/gi18n.h>
diff --git a/nautilus-desktop/nautilus-desktop-icon-file.h b/nautilus-desktop/nautilus-desktop-icon-file.h
index c652365..4271af9 100644
--- a/nautilus-desktop/nautilus-desktop-icon-file.h
+++ b/nautilus-desktop/nautilus-desktop-icon-file.h
@@ -25,7 +25,7 @@
#include "nautilus-desktop-link.h"
-#include <libnautilus-private/nautilus-file.h>
+#include <src/nautilus-file.h>
#define NAUTILUS_TYPE_DESKTOP_ICON_FILE nautilus_desktop_icon_file_get_type()
#define NAUTILUS_DESKTOP_ICON_FILE(obj) \
diff --git a/nautilus-desktop/nautilus-desktop-link-monitor.c
b/nautilus-desktop/nautilus-desktop-link-monitor.c
index 54ce6da..346e88b 100644
--- a/nautilus-desktop/nautilus-desktop-link-monitor.c
+++ b/nautilus-desktop/nautilus-desktop-link-monitor.c
@@ -32,9 +32,9 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
-#include <libnautilus-private/nautilus-trash-monitor.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-directory.h>
+#include <src/nautilus-trash-monitor.h>
+#include <src/nautilus-global-preferences.h>
+#include <src/nautilus-directory.h>
#include <string.h>
diff --git a/nautilus-desktop/nautilus-desktop-link.c b/nautilus-desktop/nautilus-desktop-link.c
index df25663..87ba908 100644
--- a/nautilus-desktop/nautilus-desktop-link.c
+++ b/nautilus-desktop/nautilus-desktop-link.c
@@ -30,10 +30,10 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-trash-monitor.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-icon-names.h>
+#include <src/nautilus-file-utilities.h>
+#include <src/nautilus-trash-monitor.h>
+#include <src/nautilus-global-preferences.h>
+#include <src/nautilus-icon-names.h>
#include <string.h>
diff --git a/nautilus-desktop/nautilus-desktop-link.h b/nautilus-desktop/nautilus-desktop-link.h
index 7c1025b..f3bcfc6 100644
--- a/nautilus-desktop/nautilus-desktop-link.h
+++ b/nautilus-desktop/nautilus-desktop-link.h
@@ -22,7 +22,7 @@
#ifndef NAUTILUS_DESKTOP_LINK_H
#define NAUTILUS_DESKTOP_LINK_H
-#include <libnautilus-private/nautilus-file.h>
+#include <src/nautilus-file.h>
#include <gio/gio.h>
#define NAUTILUS_TYPE_DESKTOP_LINK nautilus_desktop_link_get_type()
diff --git a/nautilus-desktop/nautilus-desktop-metadata.c b/nautilus-desktop/nautilus-desktop-metadata.c
index 91a1200..dd77728 100644
--- a/nautilus-desktop/nautilus-desktop-metadata.c
+++ b/nautilus-desktop/nautilus-desktop-metadata.c
@@ -24,8 +24,8 @@
#include "nautilus-desktop-metadata.h"
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-keyfile-metadata.h>
+#include <src/nautilus-file-utilities.h>
+#include <src/nautilus-keyfile-metadata.h>
static gchar *
get_keyfile_path (void)
diff --git a/nautilus-desktop/nautilus-desktop-metadata.h b/nautilus-desktop/nautilus-desktop-metadata.h
index f8c67d3..55b25d1 100644
--- a/nautilus-desktop/nautilus-desktop-metadata.h
+++ b/nautilus-desktop/nautilus-desktop-metadata.h
@@ -25,7 +25,7 @@
#include <glib.h>
-#include <libnautilus-private/nautilus-file.h>
+#include <src/nautilus-file.h>
void nautilus_desktop_set_metadata_string (NautilusFile *file,
const gchar *name,
diff --git a/nautilus-desktop/nautilus-desktop-window.c b/nautilus-desktop/nautilus-desktop-window.c
index 3e361be..7c3abec 100644
--- a/nautilus-desktop/nautilus-desktop-window.c
+++ b/nautilus-desktop/nautilus-desktop-window.c
@@ -33,9 +33,9 @@
#include <glib/gi18n.h>
#include <eel/eel-vfs-extensions.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-icon-names.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
+#include <src/nautilus-file-utilities.h>
+#include <src/nautilus-icon-names.h>
+#include <src/nautilus-global-preferences.h>
#include <src/nautilus-window.h>
#include <src/nautilus-application.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index d58d67c..b69396b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,8 +11,6 @@ noinst_LTLIBRARIES=libnautilus.la
AM_CPPFLAGS = \
-I$(top_srcdir) \
- -I$(top_srcdir)/libnautilus-private \
- -I$(top_builddir)/libnautilus-private \
-I$(top_srcdir)/libgd \
$(BASE_CFLAGS) \
$(COMMON_CFLAGS) \
@@ -20,9 +18,11 @@ AM_CPPFLAGS = \
$(WARNING_CFLAGS) \
$(EXIF_CFLAGS) \
$(EXEMPI_CFLAGS) \
+ $(TRACKER_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
+ -DNAUTILUS_EXTENSIONDIR=\""$(libdir)/nautilus/extensions-3.0"\" \
-DPREFIX=\""$(prefix)"\" \
-DVERSION="\"$(VERSION)\"" \
$(DISABLE_DEPRECATED) \
@@ -33,7 +33,6 @@ LDADD =\
$(NULL)
libnautilus_la_LIBADD =\
- $(top_builddir)/libnautilus-private/libnautilus-private.la \
$(top_builddir)/libgd/libgd.la \
$(BASE_LIBS) \
$(COMMON_LIBS) \
@@ -42,6 +41,10 @@ libnautilus_la_LIBADD =\
$(EXIF_LIBS) \
$(EXEMPI_LIBS) \
$(POPT_LIBS) \
+ $(TRACKER_LIBS) \
+ $(SELINUX_LIBS) \
+ $(top_builddir)/eel/libeel-2.la \
+ $(top_builddir)/libnautilus-extension/libnautilus-extension.la \
$(NULL)
dbus_built_sources = \
@@ -85,6 +88,8 @@ $(dbus_shell_search_provider_built_sources) : Makefile.am $(top_srcdir)/data/she
headers = \
nautilus-search-popover.h \
nautilus-special-location-bar.h \
+ nautilus-query.h \
+ nautilus-search-provider.h \
$(NULL)
resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir)/resources --generate-dependencies
$(srcdir)/resources/nautilus.gresource.xml)
@@ -132,6 +137,12 @@ nautilus-enum-types.c: $(headers) Makefile
&& cp xgen-gtc $(@F) \
&& rm -f xgen-gtc
+if ENABLE_TRACKER
+nautilus_tracker_engine_sources = \
+ nautilus-search-engine-tracker.c \
+ nautilus-search-engine-tracker.h
+endif
+
nautilus_built_sources = \
$(dbus_built_sources) \
$(dbus_freedesktop_built_sources) \
@@ -224,6 +235,117 @@ nautilus_no_main_sources = \
nautilus-window.h \
nautilus-x-content-bar.c \
nautilus-x-content-bar.h \
+ nautilus-bookmark.c \
+ nautilus-bookmark.h \
+ nautilus-canvas-container.c \
+ nautilus-canvas-container.h \
+ nautilus-canvas-dnd.c \
+ nautilus-canvas-dnd.h \
+ nautilus-canvas-item.c \
+ nautilus-canvas-item.h \
+ nautilus-canvas-private.h \
+ nautilus-clipboard-monitor.c \
+ nautilus-clipboard-monitor.h \
+ nautilus-clipboard.c \
+ nautilus-clipboard.h \
+ nautilus-column-chooser.c \
+ nautilus-column-chooser.h \
+ nautilus-column-utilities.c \
+ nautilus-column-utilities.h \
+ nautilus-debug.c \
+ nautilus-debug.h \
+ nautilus-default-file-icon.c \
+ nautilus-default-file-icon.h \
+ nautilus-directory-async.c \
+ nautilus-directory-notify.h \
+ nautilus-directory-private.h \
+ nautilus-directory.c \
+ nautilus-directory.h \
+ nautilus-dnd.c \
+ nautilus-dnd.h \
+ nautilus-entry.c \
+ nautilus-entry.h \
+ nautilus-file-attributes.h \
+ nautilus-file-changes-queue.c \
+ nautilus-file-changes-queue.h \
+ nautilus-file-conflict-dialog.c \
+ nautilus-file-conflict-dialog.h \
+ nautilus-file-operations.c \
+ nautilus-file-operations.h \
+ nautilus-file-private.h \
+ nautilus-file-queue.c \
+ nautilus-file-queue.h \
+ nautilus-file-utilities.c \
+ nautilus-file-utilities.h \
+ nautilus-file.c \
+ nautilus-file.h \
+ nautilus-global-preferences.c \
+ nautilus-global-preferences.h \
+ nautilus-icon-info.c \
+ nautilus-icon-info.h \
+ nautilus-icon-names.h \
+ nautilus-keyfile-metadata.c \
+ nautilus-keyfile-metadata.h \
+ nautilus-lib-self-check-functions.c \
+ nautilus-lib-self-check-functions.h \
+ nautilus-link.c \
+ nautilus-link.h \
+ nautilus-metadata.h \
+ nautilus-metadata.c \
+ nautilus-mime-application-chooser.c \
+ nautilus-mime-application-chooser.h \
+ nautilus-module.c \
+ nautilus-module.h \
+ nautilus-monitor.c \
+ nautilus-monitor.h \
+ nautilus-profile.c \
+ nautilus-profile.h \
+ nautilus-progress-info.c \
+ nautilus-progress-info.h \
+ nautilus-progress-info-manager.c \
+ nautilus-progress-info-manager.h \
+ nautilus-program-choosing.c \
+ nautilus-program-choosing.h \
+ nautilus-recent.c \
+ nautilus-recent.h \
+ nautilus-search-directory.c \
+ nautilus-search-directory.h \
+ nautilus-search-directory-file.c \
+ nautilus-search-directory-file.h \
+ nautilus-search-provider.c \
+ nautilus-search-provider.h \
+ nautilus-search-engine.c \
+ nautilus-search-engine.h \
+ nautilus-search-engine-model.c \
+ nautilus-search-engine-model.h \
+ nautilus-search-engine-simple.c \
+ nautilus-search-engine-simple.h \
+ nautilus-search-hit.c \
+ nautilus-search-hit.h \
+ nautilus-selection-canvas-item.c \
+ nautilus-selection-canvas-item.h \
+ nautilus-signaller.h \
+ nautilus-signaller.c \
+ nautilus-query.c \
+ nautilus-query.h \
+ nautilus-thumbnails.c \
+ nautilus-thumbnails.h \
+ nautilus-trash-monitor.c \
+ nautilus-trash-monitor.h \
+ nautilus-tree-view-drag-dest.c \
+ nautilus-tree-view-drag-dest.h \
+ nautilus-ui-utilities.c \
+ nautilus-ui-utilities.h \
+ nautilus-video-mime-types.h \
+ nautilus-vfs-directory.c \
+ nautilus-vfs-directory.h \
+ nautilus-vfs-file.c \
+ nautilus-vfs-file.h \
+ nautilus-file-undo-operations.c \
+ nautilus-file-undo-operations.h \
+ nautilus-file-undo-manager.c \
+ nautilus-file-undo-manager.h \
+ $(nautilus_tracker_engine_sources) \
$(NULL)
nodist_libnautilus_la_SOURCES = \
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 1f3b6c1..de136cb 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -39,19 +39,19 @@
#include "nautilus-window-slot.h"
#include "nautilus-preferences-window.h"
-#include <libnautilus-private/nautilus-directory-private.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-lib-self-check-functions.h>
-#include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-profile.h>
-#include <libnautilus-private/nautilus-signaller.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
+#include "nautilus-directory-private.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-file-operations.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-lib-self-check-functions.h"
+#include "nautilus-module.h"
+#include "nautilus-profile.h"
+#include "nautilus-signaller.h"
+#include "nautilus-ui-utilities.h"
#include <libnautilus-extension/nautilus-menu-provider.h>
#define DEBUG_FLAG NAUTILUS_DEBUG_APPLICATION
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/src/nautilus-autorun-software.c b/src/nautilus-autorun-software.c
index 0c7e855..8720daa 100644
--- a/src/nautilus-autorun-software.c
+++ b/src/nautilus-autorun-software.c
@@ -32,8 +32,8 @@
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-icon-info.h>
+#include "nautilus-module.h"
+#include "nautilus-icon-info.h"
typedef struct
{
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index d226620..e7939a5 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -26,9 +26,9 @@
#include <config.h>
#include "nautilus-bookmark-list.h"
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-icon-names.h>
+#include "nautilus-file-utilities.h"
+#include "nautilus-file.h"
+#include "nautilus-icon-names.h"
#include <gio/gio.h>
#include <string.h>
diff --git a/src/nautilus-bookmark-list.h b/src/nautilus-bookmark-list.h
index e8b2d73..699a8b7 100644
--- a/src/nautilus-bookmark-list.h
+++ b/src/nautilus-bookmark-list.h
@@ -26,7 +26,7 @@
#ifndef NAUTILUS_BOOKMARK_LIST_H
#define NAUTILUS_BOOKMARK_LIST_H
-#include <libnautilus-private/nautilus-bookmark.h>
+#include "nautilus-bookmark.h"
#include <gio/gio.h>
typedef struct NautilusBookmarkList NautilusBookmarkList;
diff --git a/libnautilus-private/nautilus-bookmark.c b/src/nautilus-bookmark.c
similarity index 98%
rename from libnautilus-private/nautilus-bookmark.c
rename to src/nautilus-bookmark.c
index bd15452..29a36f9 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/src/nautilus-bookmark.c
@@ -31,13 +31,13 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-icon-names.h>
+#include "nautilus-file.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-icon-names.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_BOOKMARKS
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
enum {
CONTENTS_CHANGED,
diff --git a/libnautilus-private/nautilus-bookmark.h b/src/nautilus-bookmark.h
similarity index 100%
rename from libnautilus-private/nautilus-bookmark.h
rename to src/nautilus-bookmark.h
diff --git a/libnautilus-private/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
similarity index 100%
rename from libnautilus-private/nautilus-canvas-container.c
rename to src/nautilus-canvas-container.c
diff --git a/libnautilus-private/nautilus-canvas-container.h b/src/nautilus-canvas-container.h
similarity index 99%
rename from libnautilus-private/nautilus-canvas-container.h
rename to src/nautilus-canvas-container.h
index 4618040..635349d 100644
--- a/libnautilus-private/nautilus-canvas-container.h
+++ b/src/nautilus-canvas-container.h
@@ -25,7 +25,7 @@
#define NAUTILUS_CANVAS_CONTAINER_H
#include <eel/eel-canvas.h>
-#include <libnautilus-private/nautilus-icon-info.h>
+#include "nautilus-icon-info.h"
#define NAUTILUS_TYPE_CANVAS_CONTAINER nautilus_canvas_container_get_type()
#define NAUTILUS_CANVAS_CONTAINER(obj) \
diff --git a/libnautilus-private/nautilus-canvas-dnd.c b/src/nautilus-canvas-dnd.c
similarity index 99%
rename from libnautilus-private/nautilus-canvas-dnd.c
rename to src/nautilus-canvas-dnd.c
index 04a82c2..39b68af 100644
--- a/libnautilus-private/nautilus-canvas-dnd.c
+++ b/src/nautilus-canvas-dnd.c
@@ -52,8 +52,8 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file-changes-queue.h>
+#include "nautilus-file-utilities.h"
+#include "nautilus-file-changes-queue.h"
#include <stdio.h>
#include <string.h>
diff --git a/libnautilus-private/nautilus-canvas-dnd.h b/src/nautilus-canvas-dnd.h
similarity index 95%
rename from libnautilus-private/nautilus-canvas-dnd.h
rename to src/nautilus-canvas-dnd.h
index 473faeb..7b659e3 100644
--- a/libnautilus-private/nautilus-canvas-dnd.h
+++ b/src/nautilus-canvas-dnd.h
@@ -26,8 +26,8 @@
#ifndef NAUTILUS_CANVAS_DND_H
#define NAUTILUS_CANVAS_DND_H
-#include <libnautilus-private/nautilus-canvas-container.h>
-#include <libnautilus-private/nautilus-dnd.h>
+#include "nautilus-canvas-container.h"
+#include "nautilus-dnd.h"
/* DnD-related information. */
typedef struct {
diff --git a/libnautilus-private/nautilus-canvas-item.c b/src/nautilus-canvas-item.c
similarity index 100%
rename from libnautilus-private/nautilus-canvas-item.c
rename to src/nautilus-canvas-item.c
diff --git a/libnautilus-private/nautilus-canvas-item.h b/src/nautilus-canvas-item.h
similarity index 100%
rename from libnautilus-private/nautilus-canvas-item.h
rename to src/nautilus-canvas-item.h
diff --git a/libnautilus-private/nautilus-canvas-private.h b/src/nautilus-canvas-private.h
similarity index 97%
rename from libnautilus-private/nautilus-canvas-private.h
rename to src/nautilus-canvas-private.h
index 3a25806..8e9f7c5 100644
--- a/libnautilus-private/nautilus-canvas-private.h
+++ b/src/nautilus-canvas-private.h
@@ -24,9 +24,9 @@
#define NAUTILUS_CANVAS_CONTAINER_PRIVATE_H
#include <eel/eel-glib-extensions.h>
-#include <libnautilus-private/nautilus-canvas-item.h>
-#include <libnautilus-private/nautilus-canvas-container.h>
-#include <libnautilus-private/nautilus-canvas-dnd.h>
+#include "nautilus-canvas-item.h"
+#include "nautilus-canvas-container.h"
+#include "nautilus-canvas-dnd.h"
/* An Icon. */
diff --git a/src/nautilus-canvas-view-container.c b/src/nautilus-canvas-view-container.c
index b4e0df6..53f29d8 100644
--- a/src/nautilus-canvas-view-container.c
+++ b/src/nautilus-canvas-view-container.c
@@ -27,9 +27,9 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <eel/eel-glib-extensions.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-thumbnails.h>
+#include "nautilus-global-preferences.h"
+#include "nautilus-file-attributes.h"
+#include "nautilus-thumbnails.h"
G_DEFINE_TYPE (NautilusCanvasViewContainer, nautilus_canvas_view_container, NAUTILUS_TYPE_CANVAS_CONTAINER);
diff --git a/src/nautilus-canvas-view-container.h b/src/nautilus-canvas-view-container.h
index 2197519..26bcefe 100644
--- a/src/nautilus-canvas-view-container.h
+++ b/src/nautilus-canvas-view-container.h
@@ -25,7 +25,7 @@
#include "nautilus-canvas-view.h"
-#include <libnautilus-private/nautilus-canvas-container.h>
+#include "nautilus-canvas-container.h"
typedef struct NautilusCanvasViewContainer NautilusCanvasViewContainer;
typedef struct NautilusCanvasViewContainerClass NautilusCanvasViewContainerClass;
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index a72b4b5..dcd4914 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -35,20 +35,20 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
-#include <libnautilus-private/nautilus-clipboard-monitor.h>
-#include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-dnd.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-canvas-container.h>
-#include <libnautilus-private/nautilus-canvas-dnd.h>
-#include <libnautilus-private/nautilus-link.h>
-#include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-clipboard.h>
+#include "nautilus-clipboard-monitor.h"
+#include "nautilus-directory.h"
+#include "nautilus-dnd.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-ui-utilities.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-canvas-container.h"
+#include "nautilus-canvas-dnd.h"
+#include "nautilus-link.h"
+#include "nautilus-metadata.h"
+#include "nautilus-clipboard.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_CANVAS_VIEW
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
#include <locale.h>
#include <signal.h>
diff --git a/src/nautilus-canvas-view.h b/src/nautilus-canvas-view.h
index 3e515b4..cc5cb1d 100644
--- a/src/nautilus-canvas-view.h
+++ b/src/nautilus-canvas-view.h
@@ -26,7 +26,7 @@
#define NAUTILUS_CANVAS_VIEW_H
#include "nautilus-files-view.h"
-#include "libnautilus-private/nautilus-canvas-container.h"
+#include "nautilus-canvas-container.h"
typedef struct NautilusCanvasView NautilusCanvasView;
typedef struct NautilusCanvasViewClass NautilusCanvasViewClass;
diff --git a/libnautilus-private/nautilus-clipboard-monitor.c b/src/nautilus-clipboard-monitor.c
similarity index 100%
rename from libnautilus-private/nautilus-clipboard-monitor.c
rename to src/nautilus-clipboard-monitor.c
diff --git a/libnautilus-private/nautilus-clipboard-monitor.h b/src/nautilus-clipboard-monitor.h
similarity index 100%
rename from libnautilus-private/nautilus-clipboard-monitor.h
rename to src/nautilus-clipboard-monitor.h
diff --git a/libnautilus-private/nautilus-clipboard.c b/src/nautilus-clipboard.c
similarity index 100%
rename from libnautilus-private/nautilus-clipboard.c
rename to src/nautilus-clipboard.c
diff --git a/libnautilus-private/nautilus-clipboard.h b/src/nautilus-clipboard.h
similarity index 100%
rename from libnautilus-private/nautilus-clipboard.h
rename to src/nautilus-clipboard.h
diff --git a/libnautilus-private/nautilus-column-chooser.c b/src/nautilus-column-chooser.c
similarity index 100%
rename from libnautilus-private/nautilus-column-chooser.c
rename to src/nautilus-column-chooser.c
diff --git a/libnautilus-private/nautilus-column-chooser.h b/src/nautilus-column-chooser.h
similarity index 98%
rename from libnautilus-private/nautilus-column-chooser.h
rename to src/nautilus-column-chooser.h
index b0dee94..371379e 100644
--- a/libnautilus-private/nautilus-column-chooser.h
+++ b/src/nautilus-column-chooser.h
@@ -24,7 +24,7 @@
#define NAUTILUS_COLUMN_CHOOSER_H
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
#define NAUTILUS_TYPE_COLUMN_CHOOSER nautilus_column_chooser_get_type()
#define NAUTILUS_COLUMN_CHOOSER(obj) \
diff --git a/libnautilus-private/nautilus-column-utilities.c b/src/nautilus-column-utilities.c
similarity index 99%
rename from libnautilus-private/nautilus-column-utilities.c
rename to src/nautilus-column-utilities.c
index 262a2ad..0a10229 100644
--- a/libnautilus-private/nautilus-column-utilities.c
+++ b/src/nautilus-column-utilities.c
@@ -27,7 +27,7 @@
#include <eel/eel-glib-extensions.h>
#include <glib/gi18n.h>
#include <libnautilus-extension/nautilus-column-provider.h>
-#include <libnautilus-private/nautilus-module.h>
+#include "nautilus-module.h"
static const char *default_column_order[] = {
"name",
diff --git a/libnautilus-private/nautilus-column-utilities.h b/src/nautilus-column-utilities.h
similarity index 96%
rename from libnautilus-private/nautilus-column-utilities.h
rename to src/nautilus-column-utilities.h
index e5c5aa4..83e3928 100644
--- a/libnautilus-private/nautilus-column-utilities.h
+++ b/src/nautilus-column-utilities.h
@@ -24,7 +24,7 @@
#define NAUTILUS_COLUMN_UTILITIES_H
#include <libnautilus-extension/nautilus-column.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
GList *nautilus_get_all_columns (void);
GList *nautilus_get_common_columns (void);
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index fa379a9..847afb5 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -25,10 +25,10 @@
#include "nautilus-dbus-manager.h"
#include "nautilus-generated.h"
-#include <libnautilus-private/nautilus-file-operations.h>
+#include "nautilus-file-operations.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_DBUS
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
#include <gio/gio.h>
diff --git a/libnautilus-private/nautilus-debug.c b/src/nautilus-debug.c
similarity index 100%
rename from libnautilus-private/nautilus-debug.c
rename to src/nautilus-debug.c
diff --git a/libnautilus-private/nautilus-debug.h b/src/nautilus-debug.h
similarity index 100%
rename from libnautilus-private/nautilus-debug.h
rename to src/nautilus-debug.h
diff --git a/libnautilus-private/nautilus-default-file-icon.c b/src/nautilus-default-file-icon.c
similarity index 100%
rename from libnautilus-private/nautilus-default-file-icon.c
rename to src/nautilus-default-file-icon.c
diff --git a/libnautilus-private/nautilus-default-file-icon.h b/src/nautilus-default-file-icon.h
similarity index 100%
rename from libnautilus-private/nautilus-default-file-icon.h
rename to src/nautilus-default-file-icon.h
diff --git a/src/nautilus-desktop-item-properties.c b/src/nautilus-desktop-item-properties.c
index e98e8e5..1094d73 100644
--- a/src/nautilus-desktop-item-properties.c
+++ b/src/nautilus-desktop-item-properties.c
@@ -31,8 +31,8 @@
#include <glib/gi18n.h>
#include <libnautilus-extension/nautilus-extension-types.h>
#include <libnautilus-extension/nautilus-file-info.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
+#include "nautilus-file.h"
+#include "nautilus-file-attributes.h"
#define MAIN_GROUP "Desktop Entry"
diff --git a/libnautilus-private/nautilus-directory-async.c b/src/nautilus-directory-async.c
similarity index 100%
rename from libnautilus-private/nautilus-directory-async.c
rename to src/nautilus-directory-async.c
diff --git a/libnautilus-private/nautilus-directory-notify.h b/src/nautilus-directory-notify.h
similarity index 97%
rename from libnautilus-private/nautilus-directory-notify.h
rename to src/nautilus-directory-notify.h
index c00fc5a..a55a836 100644
--- a/libnautilus-private/nautilus-directory-notify.h
+++ b/src/nautilus-directory-notify.h
@@ -20,7 +20,7 @@
*/
#include <gdk/gdk.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
typedef struct {
char *from_uri;
diff --git a/libnautilus-private/nautilus-directory-private.h b/src/nautilus-directory-private.h
similarity index 98%
rename from libnautilus-private/nautilus-directory-private.h
rename to src/nautilus-directory-private.h
index ad4fa26..dae1b96 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/src/nautilus-directory-private.h
@@ -21,10 +21,10 @@
#include <gio/gio.h>
#include <eel/eel-vfs-extensions.h>
-#include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-file-queue.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-monitor.h>
+#include "nautilus-directory.h"
+#include "nautilus-file-queue.h"
+#include "nautilus-file.h"
+#include "nautilus-monitor.h"
#include <libnautilus-extension/nautilus-info-provider.h>
#include <libxml/tree.h>
diff --git a/libnautilus-private/nautilus-directory.c b/src/nautilus-directory.c
similarity index 100%
rename from libnautilus-private/nautilus-directory.c
rename to src/nautilus-directory.c
diff --git a/libnautilus-private/nautilus-directory.h b/src/nautilus-directory.h
similarity index 99%
rename from libnautilus-private/nautilus-directory.h
rename to src/nautilus-directory.h
index ef5d00c..25e3aa2 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/src/nautilus-directory.h
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
+#include "nautilus-file-attributes.h"
/* NautilusDirectory is a class that manages the model for a directory,
real or virtual, for Nautilus, mainly the file-manager component. The directory is
diff --git a/libnautilus-private/nautilus-dnd.c b/src/nautilus-dnd.c
similarity index 99%
rename from libnautilus-private/nautilus-dnd.c
rename to src/nautilus-dnd.c
index 8970926..1731b47 100644
--- a/libnautilus-private/nautilus-dnd.c
+++ b/src/nautilus-dnd.c
@@ -33,8 +33,8 @@
#include <eel/eel-vfs-extensions.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-canvas-dnd.h>
+#include "nautilus-file-utilities.h"
+#include "nautilus-canvas-dnd.h"
#include <src/nautilus-list-view-dnd.h>
#include <stdio.h>
#include <string.h>
diff --git a/libnautilus-private/nautilus-dnd.h b/src/nautilus-dnd.h
similarity index 100%
rename from libnautilus-private/nautilus-dnd.h
rename to src/nautilus-dnd.h
diff --git a/src/nautilus-empty-view.c b/src/nautilus-empty-view.c
index 2302c7c..b8518ab 100644
--- a/src/nautilus-empty-view.c
+++ b/src/nautilus-empty-view.c
@@ -27,7 +27,7 @@
#include "nautilus-files-view.h"
#include <string.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
+#include "nautilus-file-utilities.h"
#include <eel/eel-vfs-extensions.h>
struct NautilusEmptyViewDetails {
diff --git a/libnautilus-private/nautilus-entry.c b/src/nautilus-entry.c
similarity index 100%
rename from libnautilus-private/nautilus-entry.c
rename to src/nautilus-entry.c
diff --git a/libnautilus-private/nautilus-entry.h b/src/nautilus-entry.h
similarity index 100%
rename from libnautilus-private/nautilus-entry.h
rename to src/nautilus-entry.h
diff --git a/src/nautilus-error-reporting.c b/src/nautilus-error-reporting.c
index d64499f..be08b3e 100644
--- a/src/nautilus-error-reporting.c
+++ b/src/nautilus-error-reporting.c
@@ -27,12 +27,12 @@
#include <string.h>
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
#include <eel/eel-string.h>
#include <eel/eel-stock-dialogs.h>
#define DEBUG_FLAG NAUTILUS_DEBUG_DIRECTORY_VIEW
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
#define NEW_NAME_TAG "Nautilus: new name"
#define MAXIMUM_DISPLAYED_FILE_NAME_LENGTH 50
diff --git a/src/nautilus-error-reporting.h b/src/nautilus-error-reporting.h
index e588b9c..955b937 100644
--- a/src/nautilus-error-reporting.h
+++ b/src/nautilus-error-reporting.h
@@ -25,7 +25,7 @@
#define NAUTILUS_ERROR_REPORTING_H
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
void nautilus_report_error_loading_directory (NautilusFile *file,
GError *error,
diff --git a/libnautilus-private/nautilus-file-attributes.h b/src/nautilus-file-attributes.h
similarity index 100%
rename from libnautilus-private/nautilus-file-attributes.h
rename to src/nautilus-file-attributes.h
diff --git a/libnautilus-private/nautilus-file-changes-queue.c b/src/nautilus-file-changes-queue.c
similarity index 100%
rename from libnautilus-private/nautilus-file-changes-queue.c
rename to src/nautilus-file-changes-queue.c
diff --git a/libnautilus-private/nautilus-file-changes-queue.h b/src/nautilus-file-changes-queue.h
similarity index 100%
rename from libnautilus-private/nautilus-file-changes-queue.h
rename to src/nautilus-file-changes-queue.h
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c
similarity index 100%
rename from libnautilus-private/nautilus-file-conflict-dialog.c
rename to src/nautilus-file-conflict-dialog.c
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.h b/src/nautilus-file-conflict-dialog.h
similarity index 100%
rename from libnautilus-private/nautilus-file-conflict-dialog.h
rename to src/nautilus-file-conflict-dialog.h
diff --git a/libnautilus-private/nautilus-file-operations.c b/src/nautilus-file-operations.c
similarity index 100%
rename from libnautilus-private/nautilus-file-operations.c
rename to src/nautilus-file-operations.c
diff --git a/libnautilus-private/nautilus-file-operations.h b/src/nautilus-file-operations.h
similarity index 100%
rename from libnautilus-private/nautilus-file-operations.h
rename to src/nautilus-file-operations.h
diff --git a/libnautilus-private/nautilus-file-private.h b/src/nautilus-file-private.h
similarity index 98%
rename from libnautilus-private/nautilus-file-private.h
rename to src/nautilus-file-private.h
index ce2cbf3..c498651 100644
--- a/libnautilus-private/nautilus-file-private.h
+++ b/src/nautilus-file-private.h
@@ -22,10 +22,10 @@
#ifndef NAUTILUS_FILE_PRIVATE_H
#define NAUTILUS_FILE_PRIVATE_H
-#include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-monitor.h>
-#include <libnautilus-private/nautilus-file-undo-operations.h>
+#include "nautilus-directory.h"
+#include "nautilus-file.h"
+#include "nautilus-monitor.h"
+#include "nautilus-file-undo-operations.h"
#include <eel/eel-glib-extensions.h>
#include <eel/eel-string.h>
diff --git a/libnautilus-private/nautilus-file-queue.c b/src/nautilus-file-queue.c
similarity index 100%
rename from libnautilus-private/nautilus-file-queue.c
rename to src/nautilus-file-queue.c
diff --git a/libnautilus-private/nautilus-file-queue.h b/src/nautilus-file-queue.h
similarity index 97%
rename from libnautilus-private/nautilus-file-queue.h
rename to src/nautilus-file-queue.h
index a4d0de5..b7aae0b 100644
--- a/libnautilus-private/nautilus-file-queue.h
+++ b/src/nautilus-file-queue.h
@@ -20,7 +20,7 @@
#ifndef NAUTILUS_FILE_QUEUE_H
#define NAUTILUS_FILE_QUEUE_H
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
typedef struct NautilusFileQueue NautilusFileQueue;
diff --git a/libnautilus-private/nautilus-file-undo-manager.c b/src/nautilus-file-undo-manager.c
similarity index 100%
rename from libnautilus-private/nautilus-file-undo-manager.c
rename to src/nautilus-file-undo-manager.c
diff --git a/libnautilus-private/nautilus-file-undo-manager.h b/src/nautilus-file-undo-manager.h
similarity index 97%
rename from libnautilus-private/nautilus-file-undo-manager.h
rename to src/nautilus-file-undo-manager.h
index 777dece..a5e21d7 100644
--- a/libnautilus-private/nautilus-file-undo-manager.h
+++ b/src/nautilus-file-undo-manager.h
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <libnautilus-private/nautilus-file-undo-operations.h>
+#include "nautilus-file-undo-operations.h"
typedef struct _NautilusFileUndoManager NautilusFileUndoManager;
typedef struct _NautilusFileUndoManagerClass NautilusFileUndoManagerClass;
diff --git a/libnautilus-private/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c
similarity index 100%
rename from libnautilus-private/nautilus-file-undo-operations.c
rename to src/nautilus-file-undo-operations.c
diff --git a/libnautilus-private/nautilus-file-undo-operations.h b/src/nautilus-file-undo-operations.h
similarity index 100%
rename from libnautilus-private/nautilus-file-undo-operations.h
rename to src/nautilus-file-undo-operations.h
diff --git a/libnautilus-private/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
similarity index 100%
rename from libnautilus-private/nautilus-file-utilities.c
rename to src/nautilus-file-utilities.c
diff --git a/libnautilus-private/nautilus-file-utilities.h b/src/nautilus-file-utilities.h
similarity index 100%
rename from libnautilus-private/nautilus-file-utilities.h
rename to src/nautilus-file-utilities.h
diff --git a/libnautilus-private/nautilus-file.c b/src/nautilus-file.c
similarity index 99%
rename from libnautilus-private/nautilus-file.c
rename to src/nautilus-file.c
index 31965d0..49f23c9 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -67,7 +67,7 @@
#endif
#define DEBUG_FLAG NAUTILUS_DEBUG_FILE
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
/* Time in seconds to cache getpwuid results */
#define GETPWUID_CACHE_TIME (5*60)
diff --git a/libnautilus-private/nautilus-file.h b/src/nautilus-file.h
similarity index 99%
rename from libnautilus-private/nautilus-file.h
rename to src/nautilus-file.h
index 8623588..46085b2 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/src/nautilus-file.h
@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-icon-info.h>
+#include "nautilus-file-attributes.h"
+#include "nautilus-icon-info.h"
/* NautilusFile is an object used to represent a single element of a
* NautilusDirectory. It's lightweight and relies on NautilusDirectory
diff --git a/src/nautilus-files-view-dnd.c b/src/nautilus-files-view-dnd.c
index addd872..eeba663 100644
--- a/src/nautilus-files-view-dnd.c
+++ b/src/nautilus-files-view-dnd.c
@@ -36,9 +36,9 @@
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-clipboard.h>
-#include <libnautilus-private/nautilus-dnd.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
+#include "nautilus-clipboard.h"
+#include "nautilus-dnd.h"
+#include "nautilus-global-preferences.h"
#define GET_ANCESTOR(obj) \
GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (obj), GTK_TYPE_WINDOW))
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index f1e4bac..0605ac7 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -67,31 +67,31 @@
#include <eel/eel-vfs-extensions.h>
#include <libnautilus-extension/nautilus-menu-provider.h>
-#include <libnautilus-private/nautilus-clipboard.h>
-#include <libnautilus-private/nautilus-clipboard-monitor.h>
-#include <libnautilus-private/nautilus-search-directory.h>
-#include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-dnd.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-file-changes-queue.h>
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file-private.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-link.h>
-#include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-profile.h>
-#include <libnautilus-private/nautilus-program-choosing.h>
-#include <libnautilus-private/nautilus-trash-monitor.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
-#include <libnautilus-private/nautilus-signaller.h>
-#include <libnautilus-private/nautilus-icon-names.h>
+#include "nautilus-clipboard.h"
+#include "nautilus-clipboard-monitor.h"
+#include "nautilus-search-directory.h"
+#include "nautilus-directory.h"
+#include "nautilus-dnd.h"
+#include "nautilus-file-attributes.h"
+#include "nautilus-file-changes-queue.h"
+#include "nautilus-file-operations.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-file-private.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-link.h"
+#include "nautilus-metadata.h"
+#include "nautilus-module.h"
+#include "nautilus-profile.h"
+#include "nautilus-program-choosing.h"
+#include "nautilus-trash-monitor.h"
+#include "nautilus-ui-utilities.h"
+#include "nautilus-signaller.h"
+#include "nautilus-icon-names.h"
#include <gdesktop-enums.h>
#define DEBUG_FLAG NAUTILUS_DEBUG_DIRECTORY_VIEW
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
/* Minimum starting update inverval */
#define UPDATE_INTERVAL_MIN 100
diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h
index efb4dea..9b5a28b 100644
--- a/src/nautilus-files-view.h
+++ b/src/nautilus-files-view.h
@@ -28,9 +28,9 @@
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-link.h>
+#include "nautilus-directory.h"
+#include "nautilus-file.h"
+#include "nautilus-link.h"
typedef struct NautilusFilesView NautilusFilesView;
typedef struct NautilusFilesViewClass NautilusFilesViewClass;
diff --git a/src/nautilus-freedesktop-dbus.c b/src/nautilus-freedesktop-dbus.c
index 5b72fcb..7d03bc0 100644
--- a/src/nautilus-freedesktop-dbus.c
+++ b/src/nautilus-freedesktop-dbus.c
@@ -26,7 +26,7 @@
/* We share the same debug domain as nautilus-dbus-manager */
#define DEBUG_FLAG NAUTILUS_DEBUG_DBUS
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
#include "nautilus-properties-window.h"
diff --git a/libnautilus-private/nautilus-global-preferences.c b/src/nautilus-global-preferences.c
similarity index 100%
rename from libnautilus-private/nautilus-global-preferences.c
rename to src/nautilus-global-preferences.c
diff --git a/libnautilus-private/nautilus-global-preferences.h b/src/nautilus-global-preferences.h
similarity index 99%
rename from libnautilus-private/nautilus-global-preferences.h
rename to src/nautilus-global-preferences.h
index 8597ec1..ef1f8aa 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/src/nautilus-global-preferences.h
@@ -24,7 +24,7 @@
#ifndef NAUTILUS_GLOBAL_PREFERENCES_H
#define NAUTILUS_GLOBAL_PREFERENCES_H
-#include <libnautilus-private/nautilus-global-preferences.h>
+#include "nautilus-global-preferences.h"
#include <gio/gio.h>
G_BEGIN_DECLS
diff --git a/libnautilus-private/nautilus-icon-info.c b/src/nautilus-icon-info.c
similarity index 100%
rename from libnautilus-private/nautilus-icon-info.c
rename to src/nautilus-icon-info.c
diff --git a/libnautilus-private/nautilus-icon-info.h b/src/nautilus-icon-info.h
similarity index 100%
rename from libnautilus-private/nautilus-icon-info.h
rename to src/nautilus-icon-info.h
diff --git a/libnautilus-private/nautilus-icon-names.h b/src/nautilus-icon-names.h
similarity index 100%
rename from libnautilus-private/nautilus-icon-names.h
rename to src/nautilus-icon-names.h
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index bac8b7c..3cf3253 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -28,7 +28,7 @@
#include <gio/gio.h>
#include <eel/eel-vfs-extensions.h>
#include <libnautilus-extension/nautilus-property-page-provider.h>
-#include <libnautilus-private/nautilus-module.h>
+#include "nautilus-module.h"
#include <string.h>
#ifdef HAVE_EXIF
diff --git a/libnautilus-private/nautilus-keyfile-metadata.c b/src/nautilus-keyfile-metadata.c
similarity index 100%
rename from libnautilus-private/nautilus-keyfile-metadata.c
rename to src/nautilus-keyfile-metadata.c
diff --git a/libnautilus-private/nautilus-keyfile-metadata.h b/src/nautilus-keyfile-metadata.h
similarity index 97%
rename from libnautilus-private/nautilus-keyfile-metadata.h
rename to src/nautilus-keyfile-metadata.h
index b8a14ee..f9dede5 100644
--- a/libnautilus-private/nautilus-keyfile-metadata.h
+++ b/src/nautilus-keyfile-metadata.h
@@ -25,7 +25,7 @@
#include <glib.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
void nautilus_keyfile_metadata_set_string (NautilusFile *file,
const char *keyfile_filename,
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.c b/src/nautilus-lib-self-check-functions.c
similarity index 100%
rename from libnautilus-private/nautilus-lib-self-check-functions.c
rename to src/nautilus-lib-self-check-functions.c
diff --git a/libnautilus-private/nautilus-lib-self-check-functions.h b/src/nautilus-lib-self-check-functions.h
similarity index 100%
rename from libnautilus-private/nautilus-lib-self-check-functions.h
rename to src/nautilus-lib-self-check-functions.h
diff --git a/libnautilus-private/nautilus-link.c b/src/nautilus-link.c
similarity index 100%
rename from libnautilus-private/nautilus-link.c
rename to src/nautilus-link.c
diff --git a/libnautilus-private/nautilus-link.h b/src/nautilus-link.h
similarity index 100%
rename from libnautilus-private/nautilus-link.h
rename to src/nautilus-link.h
diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c
index 6fc715b..fe7fea2 100644
--- a/src/nautilus-list-model.c
+++ b/src/nautilus-list-model.c
@@ -33,7 +33,7 @@
#include <cairo-gobject.h>
#include <eel/eel-graphic-effects.h>
-#include <libnautilus-private/nautilus-dnd.h>
+#include "nautilus-dnd.h"
enum {
SUBDIRECTORY_UNLOADED,
diff --git a/src/nautilus-list-model.h b/src/nautilus-list-model.h
index 2f3fe19..88f486d 100644
--- a/src/nautilus-list-model.h
+++ b/src/nautilus-list-model.h
@@ -22,8 +22,8 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-directory.h>
+#include "nautilus-file.h"
+#include "nautilus-directory.h"
#include <libnautilus-extension/nautilus-column.h>
#ifndef NAUTILUS_LIST_MODEL_H
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 208ae81..f23f4ce 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -44,20 +44,20 @@
#include <glib-object.h>
#include <libgd/gd.h>
#include <libnautilus-extension/nautilus-column-provider.h>
-#include <libnautilus-private/nautilus-clipboard-monitor.h>
-#include <libnautilus-private/nautilus-column-chooser.h>
-#include <libnautilus-private/nautilus-column-utilities.h>
-#include <libnautilus-private/nautilus-dnd.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-tree-view-drag-dest.h>
-#include <libnautilus-private/nautilus-clipboard.h>
+#include "nautilus-clipboard-monitor.h"
+#include "nautilus-column-chooser.h"
+#include "nautilus-column-utilities.h"
+#include "nautilus-dnd.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-ui-utilities.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-metadata.h"
+#include "nautilus-module.h"
+#include "nautilus-tree-view-drag-dest.h"
+#include "nautilus-clipboard.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_LIST_VIEW
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
/* We use a rectangle to make the popover point to the right column. In an
* ideal world with GtkListBox we would just point to the GtkListBoxRow. In our case, we
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index 53d6ef2..306b6e4 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -37,9 +37,9 @@
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-entry.h>
-#include <libnautilus-private/nautilus-clipboard.h>
+#include "nautilus-file-utilities.h"
+#include "nautilus-entry.h"
+#include "nautilus-clipboard.h"
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-string.h>
#include <eel/eel-vfs-extensions.h>
diff --git a/src/nautilus-location-entry.h b/src/nautilus-location-entry.h
index eeaafe6..980a561 100644
--- a/src/nautilus-location-entry.h
+++ b/src/nautilus-location-entry.h
@@ -25,7 +25,7 @@
#ifndef NAUTILUS_LOCATION_ENTRY_H
#define NAUTILUS_LOCATION_ENTRY_H
-#include <libnautilus-private/nautilus-entry.h>
+#include "nautilus-entry.h"
#define NAUTILUS_TYPE_LOCATION_ENTRY nautilus_location_entry_get_type()
#define NAUTILUS_LOCATION_ENTRY(obj) \
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 01c6550..511cfda 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -31,7 +31,7 @@
#include "nautilus-application.h"
#include "nautilus-resources.h"
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
#include <eel/eel-debug.h>
#include <glib/gi18n.h>
diff --git a/libnautilus-private/nautilus-metadata.c b/src/nautilus-metadata.c
similarity index 100%
rename from libnautilus-private/nautilus-metadata.c
rename to src/nautilus-metadata.c
diff --git a/libnautilus-private/nautilus-metadata.h b/src/nautilus-metadata.h
similarity index 100%
rename from libnautilus-private/nautilus-metadata.h
rename to src/nautilus-metadata.h
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index a7fd4c9..c09ca43 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -36,16 +36,16 @@
#include <string.h>
#include <gdk/gdkx.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-program-choosing.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-signaller.h>
+#include "nautilus-file-attributes.h"
+#include "nautilus-file.h"
+#include "nautilus-file-operations.h"
+#include "nautilus-metadata.h"
+#include "nautilus-program-choosing.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-signaller.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_MIME
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
typedef enum {
ACTIVATION_ACTION_LAUNCH_DESKTOP_FILE,
diff --git a/src/nautilus-mime-actions.h b/src/nautilus-mime-actions.h
index 0349c21..f96ca66 100644
--- a/src/nautilus-mime-actions.h
+++ b/src/nautilus-mime-actions.h
@@ -26,7 +26,7 @@
#include <gio/gio.h>
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
#include "nautilus-window.h"
diff --git a/libnautilus-private/nautilus-mime-application-chooser.c b/src/nautilus-mime-application-chooser.c
similarity index 100%
rename from libnautilus-private/nautilus-mime-application-chooser.c
rename to src/nautilus-mime-application-chooser.c
diff --git a/libnautilus-private/nautilus-mime-application-chooser.h b/src/nautilus-mime-application-chooser.h
similarity index 100%
rename from libnautilus-private/nautilus-mime-application-chooser.h
rename to src/nautilus-mime-application-chooser.h
diff --git a/libnautilus-private/nautilus-module.c b/src/nautilus-module.c
similarity index 100%
rename from libnautilus-private/nautilus-module.c
rename to src/nautilus-module.c
diff --git a/libnautilus-private/nautilus-module.h b/src/nautilus-module.h
similarity index 100%
rename from libnautilus-private/nautilus-module.h
rename to src/nautilus-module.h
diff --git a/libnautilus-private/nautilus-monitor.c b/src/nautilus-monitor.c
similarity index 100%
rename from libnautilus-private/nautilus-monitor.c
rename to src/nautilus-monitor.c
diff --git a/libnautilus-private/nautilus-monitor.h b/src/nautilus-monitor.h
similarity index 100%
rename from libnautilus-private/nautilus-monitor.h
rename to src/nautilus-monitor.h
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 693fcb5..d7c3d95 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -25,12 +25,12 @@
#include "nautilus-pathbar.h"
#include "nautilus-properties-window.h"
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-icon-names.h>
-#include <libnautilus-private/nautilus-trash-monitor.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
+#include "nautilus-file.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-icon-names.h"
+#include "nautilus-trash-monitor.h"
+#include "nautilus-ui-utilities.h"
#include "nautilus-window-slot-dnd.h"
diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c
index 22ffc44..5fe783b 100644
--- a/src/nautilus-preferences-window.c
+++ b/src/nautilus-preferences-window.c
@@ -35,10 +35,10 @@
#include <eel/eel-glib-extensions.h>
-#include <libnautilus-private/nautilus-column-chooser.h>
-#include <libnautilus-private/nautilus-column-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-module.h>
+#include "nautilus-column-chooser.h"
+#include "nautilus-column-utilities.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-module.h"
/* string enum preferences */
#define NAUTILUS_PREFERENCES_DIALOG_DEFAULT_VIEW_WIDGET "default_view_combobox"
diff --git a/src/nautilus-previewer.c b/src/nautilus-previewer.c
index 5594401..272abed 100644
--- a/src/nautilus-previewer.c
+++ b/src/nautilus-previewer.c
@@ -25,7 +25,7 @@
#include "nautilus-previewer.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_PREVIEWER
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
#include <gio/gio.h>
diff --git a/libnautilus-private/nautilus-private-enum-types.c.template
b/src/nautilus-private-enum-types.c.template
similarity index 100%
rename from libnautilus-private/nautilus-private-enum-types.c.template
rename to src/nautilus-private-enum-types.c.template
diff --git a/libnautilus-private/nautilus-private-enum-types.h.template
b/src/nautilus-private-enum-types.h.template
similarity index 100%
rename from libnautilus-private/nautilus-private-enum-types.h.template
rename to src/nautilus-private-enum-types.h.template
diff --git a/libnautilus-private/nautilus-profile.c b/src/nautilus-profile.c
similarity index 100%
rename from libnautilus-private/nautilus-profile.c
rename to src/nautilus-profile.c
diff --git a/libnautilus-private/nautilus-profile.h b/src/nautilus-profile.h
similarity index 100%
rename from libnautilus-private/nautilus-profile.h
rename to src/nautilus-profile.h
diff --git a/libnautilus-private/nautilus-program-choosing.c b/src/nautilus-program-choosing.c
similarity index 100%
rename from libnautilus-private/nautilus-program-choosing.c
rename to src/nautilus-program-choosing.c
diff --git a/libnautilus-private/nautilus-program-choosing.h b/src/nautilus-program-choosing.h
similarity index 98%
rename from libnautilus-private/nautilus-program-choosing.h
rename to src/nautilus-program-choosing.h
index 93c2070..04dbf4c 100644
--- a/libnautilus-private/nautilus-program-choosing.h
+++ b/src/nautilus-program-choosing.h
@@ -26,7 +26,7 @@
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
typedef void (*NautilusApplicationChoiceCallback) (GAppInfo *application,
gpointer callback_data);
diff --git a/libnautilus-private/nautilus-progress-info-manager.c b/src/nautilus-progress-info-manager.c
similarity index 100%
rename from libnautilus-private/nautilus-progress-info-manager.c
rename to src/nautilus-progress-info-manager.c
diff --git a/libnautilus-private/nautilus-progress-info-manager.h b/src/nautilus-progress-info-manager.h
similarity index 98%
rename from libnautilus-private/nautilus-progress-info-manager.h
rename to src/nautilus-progress-info-manager.h
index 54d2ce6..5719902 100644
--- a/libnautilus-private/nautilus-progress-info-manager.h
+++ b/src/nautilus-progress-info-manager.h
@@ -25,7 +25,7 @@
#include <glib-object.h>
-#include <libnautilus-private/nautilus-progress-info.h>
+#include "nautilus-progress-info.h"
#define NAUTILUS_TYPE_PROGRESS_INFO_MANAGER nautilus_progress_info_manager_get_type()
#define NAUTILUS_PROGRESS_INFO_MANAGER(obj) \
diff --git a/src/nautilus-progress-info-widget.h b/src/nautilus-progress-info-widget.h
index d57e38d..74c5a4d 100644
--- a/src/nautilus-progress-info-widget.h
+++ b/src/nautilus-progress-info-widget.h
@@ -26,7 +26,7 @@
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-progress-info.h>
+#include "nautilus-progress-info.h"
#define NAUTILUS_TYPE_PROGRESS_INFO_WIDGET nautilus_progress_info_widget_get_type()
#define NAUTILUS_PROGRESS_INFO_WIDGET(obj) \
diff --git a/libnautilus-private/nautilus-progress-info.c b/src/nautilus-progress-info.c
similarity index 100%
rename from libnautilus-private/nautilus-progress-info.c
rename to src/nautilus-progress-info.c
diff --git a/libnautilus-private/nautilus-progress-info.h b/src/nautilus-progress-info.h
similarity index 100%
rename from libnautilus-private/nautilus-progress-info.h
rename to src/nautilus-progress-info.h
diff --git a/src/nautilus-progress-persistence-handler.c b/src/nautilus-progress-persistence-handler.c
index 774d392..3c704cd 100644
--- a/src/nautilus-progress-persistence-handler.c
+++ b/src/nautilus-progress-persistence-handler.c
@@ -31,8 +31,8 @@
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-progress-info.h>
-#include <libnautilus-private/nautilus-progress-info-manager.h>
+#include "nautilus-progress-info.h"
+#include "nautilus-progress-info-manager.h"
struct _NautilusProgressPersistenceHandlerPriv {
NautilusProgressInfoManager *manager;
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 986b107..94544c3 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -47,15 +47,15 @@
#include <eel/eel-vfs-extensions.h>
#include <libnautilus-extension/nautilus-property-page-provider.h>
-#include <libnautilus-private/nautilus-entry.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-link.h>
-#include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-mime-application-chooser.h>
-#include <libnautilus-private/nautilus-module.h>
+#include "nautilus-entry.h"
+#include "nautilus-file-attributes.h"
+#include "nautilus-file-operations.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-link.h"
+#include "nautilus-metadata.h"
+#include "nautilus-mime-application-chooser.h"
+#include "nautilus-module.h"
#if HAVE_SYS_VFS_H
#include <sys/vfs.h>
diff --git a/src/nautilus-properties-window.h b/src/nautilus-properties-window.h
index 34ac4da..9eff54c 100644
--- a/src/nautilus-properties-window.h
+++ b/src/nautilus-properties-window.h
@@ -25,7 +25,7 @@
#define NAUTILUS_PROPERTIES_WINDOW_H
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
typedef struct NautilusPropertiesWindow NautilusPropertiesWindow;
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 26f601d..4e69fe9 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -33,9 +33,9 @@
#include <libgd/gd.h>
#include <eel/eel-glib-extensions.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
+#include "nautilus-file-utilities.h"
+#include "nautilus-ui-utilities.h"
+#include "nautilus-global-preferences.h"
typedef struct {
GtkWidget *entry;
diff --git a/src/nautilus-query-editor.h b/src/nautilus-query-editor.h
index f3bab15..b940996 100644
--- a/src/nautilus-query-editor.h
+++ b/src/nautilus-query-editor.h
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-query.h>
+#include "nautilus-query.h"
#define NAUTILUS_TYPE_QUERY_EDITOR nautilus_query_editor_get_type()
diff --git a/libnautilus-private/nautilus-query.c b/src/nautilus-query.c
similarity index 99%
rename from libnautilus-private/nautilus-query.c
rename to src/nautilus-query.c
index 3444b1e..96cc3a4 100644
--- a/libnautilus-private/nautilus-query.c
+++ b/src/nautilus-query.c
@@ -25,11 +25,11 @@
#include <eel/eel-glib-extensions.h>
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
+#include "nautilus-global-preferences.h"
#include "nautilus-file-utilities.h"
#include "nautilus-query.h"
-#include "nautilus-private-enum-types.h"
+#include "nautilus-enum-types.h"
struct _NautilusQuery {
GObject parent;
diff --git a/libnautilus-private/nautilus-query.h b/src/nautilus-query.h
similarity index 100%
rename from libnautilus-private/nautilus-query.h
rename to src/nautilus-query.h
diff --git a/libnautilus-private/nautilus-recent.c b/src/nautilus-recent.c
similarity index 100%
rename from libnautilus-private/nautilus-recent.c
rename to src/nautilus-recent.c
diff --git a/libnautilus-private/nautilus-recent.h b/src/nautilus-recent.h
similarity index 80%
rename from libnautilus-private/nautilus-recent.h
rename to src/nautilus-recent.h
index c18f606..5c64f6c 100644
--- a/libnautilus-private/nautilus-recent.h
+++ b/src/nautilus-recent.h
@@ -4,7 +4,7 @@
#define __NAUTILUS_RECENT_H__
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
#include <gio/gio.h>
void nautilus_recent_add_file (NautilusFile *file,
diff --git a/libnautilus-private/nautilus-search-directory-file.c b/src/nautilus-search-directory-file.c
similarity index 100%
rename from libnautilus-private/nautilus-search-directory-file.c
rename to src/nautilus-search-directory-file.c
diff --git a/libnautilus-private/nautilus-search-directory-file.h b/src/nautilus-search-directory-file.h
similarity index 97%
rename from libnautilus-private/nautilus-search-directory-file.h
rename to src/nautilus-search-directory-file.h
index ddc8f02..5f47c3b 100644
--- a/libnautilus-private/nautilus-search-directory-file.h
+++ b/src/nautilus-search-directory-file.h
@@ -23,7 +23,7 @@
#ifndef NAUTILUS_SEARCH_DIRECTORY_FILE_H
#define NAUTILUS_SEARCH_DIRECTORY_FILE_H
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
#define NAUTILUS_TYPE_SEARCH_DIRECTORY_FILE nautilus_search_directory_file_get_type()
#define NAUTILUS_SEARCH_DIRECTORY_FILE(obj) \
diff --git a/libnautilus-private/nautilus-search-directory.c b/src/nautilus-search-directory.c
similarity index 100%
rename from libnautilus-private/nautilus-search-directory.c
rename to src/nautilus-search-directory.c
diff --git a/libnautilus-private/nautilus-search-directory.h b/src/nautilus-search-directory.h
similarity index 96%
rename from libnautilus-private/nautilus-search-directory.h
rename to src/nautilus-search-directory.h
index 48f53cc..a6b702b 100644
--- a/libnautilus-private/nautilus-search-directory.h
+++ b/src/nautilus-search-directory.h
@@ -22,8 +22,8 @@
#ifndef NAUTILUS_SEARCH_DIRECTORY_H
#define NAUTILUS_SEARCH_DIRECTORY_H
-#include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-query.h>
+#include "nautilus-directory.h"
+#include "nautilus-query.h"
#define NAUTILUS_SEARCH_DIRECTORY_PROVIDER_NAME "search-directory-provider"
diff --git a/libnautilus-private/nautilus-search-engine-model.c b/src/nautilus-search-engine-model.c
similarity index 100%
rename from libnautilus-private/nautilus-search-engine-model.c
rename to src/nautilus-search-engine-model.c
diff --git a/libnautilus-private/nautilus-search-engine-model.h b/src/nautilus-search-engine-model.h
similarity index 97%
rename from libnautilus-private/nautilus-search-engine-model.h
rename to src/nautilus-search-engine-model.h
index e32a8c2..16f3388 100644
--- a/libnautilus-private/nautilus-search-engine-model.h
+++ b/src/nautilus-search-engine-model.h
@@ -22,7 +22,7 @@
#ifndef NAUTILUS_SEARCH_ENGINE_MODEL_H
#define NAUTILUS_SEARCH_ENGINE_MODEL_H
-#include <libnautilus-private/nautilus-directory.h>
+#include "nautilus-directory.h"
#define NAUTILUS_TYPE_SEARCH_ENGINE_MODEL (nautilus_search_engine_model_get_type ())
#define NAUTILUS_SEARCH_ENGINE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
NAUTILUS_TYPE_SEARCH_ENGINE_MODEL, NautilusSearchEngineModel))
diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/src/nautilus-search-engine-simple.c
similarity index 100%
rename from libnautilus-private/nautilus-search-engine-simple.c
rename to src/nautilus-search-engine-simple.c
diff --git a/libnautilus-private/nautilus-search-engine-simple.h b/src/nautilus-search-engine-simple.h
similarity index 100%
rename from libnautilus-private/nautilus-search-engine-simple.h
rename to src/nautilus-search-engine-simple.h
diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
similarity index 100%
rename from libnautilus-private/nautilus-search-engine-tracker.c
rename to src/nautilus-search-engine-tracker.c
diff --git a/libnautilus-private/nautilus-search-engine-tracker.h b/src/nautilus-search-engine-tracker.h
similarity index 97%
rename from libnautilus-private/nautilus-search-engine-tracker.h
rename to src/nautilus-search-engine-tracker.h
index b636c2e..a196b5a 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.h
+++ b/src/nautilus-search-engine-tracker.h
@@ -22,7 +22,7 @@
#ifndef NAUTILUS_SEARCH_ENGINE_TRACKER_H
#define NAUTILUS_SEARCH_ENGINE_TRACKER_H
-#include <libnautilus-private/nautilus-search-engine.h>
+#include "nautilus-search-engine.h"
#define NAUTILUS_TYPE_SEARCH_ENGINE_TRACKER (nautilus_search_engine_tracker_get_type ())
#define NAUTILUS_SEARCH_ENGINE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
NAUTILUS_TYPE_SEARCH_ENGINE_TRACKER, NautilusSearchEngineTracker))
diff --git a/libnautilus-private/nautilus-search-engine.c b/src/nautilus-search-engine.c
similarity index 100%
rename from libnautilus-private/nautilus-search-engine.c
rename to src/nautilus-search-engine.c
diff --git a/libnautilus-private/nautilus-search-engine.h b/src/nautilus-search-engine.h
similarity index 92%
rename from libnautilus-private/nautilus-search-engine.h
rename to src/nautilus-search-engine.h
index d9921a6..7018da5 100644
--- a/libnautilus-private/nautilus-search-engine.h
+++ b/src/nautilus-search-engine.h
@@ -24,9 +24,9 @@
#include <glib-object.h>
-#include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-search-engine-model.h>
-#include <libnautilus-private/nautilus-search-engine-simple.h>
+#include "nautilus-directory.h"
+#include "nautilus-search-engine-model.h"
+#include "nautilus-search-engine-simple.h"
#define NAUTILUS_TYPE_SEARCH_ENGINE (nautilus_search_engine_get_type ())
#define NAUTILUS_SEARCH_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
NAUTILUS_TYPE_SEARCH_ENGINE, NautilusSearchEngine))
diff --git a/libnautilus-private/nautilus-search-hit.c b/src/nautilus-search-hit.c
similarity index 100%
rename from libnautilus-private/nautilus-search-hit.c
rename to src/nautilus-search-hit.c
diff --git a/libnautilus-private/nautilus-search-hit.h b/src/nautilus-search-hit.h
similarity index 100%
rename from libnautilus-private/nautilus-search-hit.h
rename to src/nautilus-search-hit.h
diff --git a/src/nautilus-search-popover.c b/src/nautilus-search-popover.c
index 6369c52..15e3a23 100644
--- a/src/nautilus-search-popover.c
+++ b/src/nautilus-search-popover.c
@@ -21,9 +21,9 @@
#include "nautilus-mime-actions.h"
#include <glib/gi18n.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
+#include "nautilus-file.h"
+#include "nautilus-ui-utilities.h"
+#include "nautilus-global-preferences.h"
#define SEARCH_FILTER_MAX_YEARS 5
diff --git a/src/nautilus-search-popover.h b/src/nautilus-search-popover.h
index 6c80fc6..1d872f1 100644
--- a/src/nautilus-search-popover.h
+++ b/src/nautilus-search-popover.h
@@ -22,7 +22,7 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-query.h>
+#include "nautilus-query.h"
G_BEGIN_DECLS
diff --git a/libnautilus-private/nautilus-search-provider.c b/src/nautilus-search-provider.c
similarity index 99%
rename from libnautilus-private/nautilus-search-provider.c
rename to src/nautilus-search-provider.c
index 2c47104..ccbd785 100644
--- a/libnautilus-private/nautilus-search-provider.c
+++ b/src/nautilus-search-provider.c
@@ -18,7 +18,7 @@
#include <config.h>
#include "nautilus-search-provider.h"
-#include "nautilus-private-enum-types.c"
+#include "nautilus-enum-types.c"
#include <glib-object.h>
diff --git a/libnautilus-private/nautilus-search-provider.h b/src/nautilus-search-provider.h
similarity index 97%
rename from libnautilus-private/nautilus-search-provider.h
rename to src/nautilus-search-provider.h
index 96b4cf4..d019c66 100644
--- a/libnautilus-private/nautilus-search-provider.h
+++ b/src/nautilus-search-provider.h
@@ -19,8 +19,8 @@
#define NAUTILUS_SEARCH_PROVIDER_H
#include <glib-object.h>
-#include <libnautilus-private/nautilus-query.h>
-#include <libnautilus-private/nautilus-search-hit.h>
+#include "nautilus-query.h"
+#include "nautilus-search-hit.h"
G_BEGIN_DECLS
diff --git a/libnautilus-private/nautilus-selection-canvas-item.c b/src/nautilus-selection-canvas-item.c
similarity index 100%
rename from libnautilus-private/nautilus-selection-canvas-item.c
rename to src/nautilus-selection-canvas-item.c
diff --git a/libnautilus-private/nautilus-selection-canvas-item.h b/src/nautilus-selection-canvas-item.h
similarity index 100%
rename from libnautilus-private/nautilus-selection-canvas-item.h
rename to src/nautilus-selection-canvas-item.h
diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
index dd91c29..41ee0d9 100644
--- a/src/nautilus-shell-search-provider.c
+++ b/src/nautilus-shell-search-provider.c
@@ -28,11 +28,11 @@
#include <glib/gi18n.h>
#include <gdk/gdkx.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-search-engine.h>
-#include <libnautilus-private/nautilus-search-provider.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
+#include "nautilus-file.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-search-engine.h"
+#include "nautilus-search-provider.h"
+#include "nautilus-ui-utilities.h"
#include "nautilus-application.h"
#include "nautilus-bookmark-list.h"
diff --git a/libnautilus-private/nautilus-signaller.c b/src/nautilus-signaller.c
similarity index 100%
rename from libnautilus-private/nautilus-signaller.c
rename to src/nautilus-signaller.c
diff --git a/libnautilus-private/nautilus-signaller.h b/src/nautilus-signaller.h
similarity index 100%
rename from libnautilus-private/nautilus-signaller.h
rename to src/nautilus-signaller.h
diff --git a/libnautilus-private/nautilus-thumbnails.c b/src/nautilus-thumbnails.c
similarity index 100%
rename from libnautilus-private/nautilus-thumbnails.c
rename to src/nautilus-thumbnails.c
diff --git a/libnautilus-private/nautilus-thumbnails.h b/src/nautilus-thumbnails.h
similarity index 96%
rename from libnautilus-private/nautilus-thumbnails.h
rename to src/nautilus-thumbnails.h
index 9edaec5..3544072 100644
--- a/libnautilus-private/nautilus-thumbnails.h
+++ b/src/nautilus-thumbnails.h
@@ -23,7 +23,7 @@
#define NAUTILUS_THUMBNAILS_H
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
/* Returns NULL if there's no thumbnail yet. */
void nautilus_create_thumbnail (NautilusFile *file);
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index 3c12558..02e204b 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -31,10 +31,10 @@
#include "nautilus-progress-info-widget.h"
#include "nautilus-application.h"
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
-#include <libnautilus-private/nautilus-progress-info-manager.h>
-#include <libnautilus-private/nautilus-file-operations.h>
+#include "nautilus-global-preferences.h"
+#include "nautilus-ui-utilities.h"
+#include "nautilus-progress-info-manager.h"
+#include "nautilus-file-operations.h"
#include <glib/gi18n.h>
#include <math.h>
diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
index 9eeed44..dd4327a 100644
--- a/src/nautilus-trash-bar.c
+++ b/src/nautilus-trash-bar.c
@@ -26,10 +26,10 @@
#include "nautilus-trash-bar.h"
#include "nautilus-files-view.h"
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-trash-monitor.h>
+#include "nautilus-file-operations.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-file.h"
+#include "nautilus-trash-monitor.h"
#define NAUTILUS_TRASH_BAR_GET_PRIVATE(o)\
(G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_TRASH_BAR, NautilusTrashBarPrivate))
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/src/nautilus-trash-monitor.c
similarity index 100%
rename from libnautilus-private/nautilus-trash-monitor.c
rename to src/nautilus-trash-monitor.c
diff --git a/libnautilus-private/nautilus-trash-monitor.h b/src/nautilus-trash-monitor.h
similarity index 100%
rename from libnautilus-private/nautilus-trash-monitor.h
rename to src/nautilus-trash-monitor.h
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/src/nautilus-tree-view-drag-dest.c
similarity index 100%
rename from libnautilus-private/nautilus-tree-view-drag-dest.c
rename to src/nautilus-tree-view-drag-dest.c
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.h b/src/nautilus-tree-view-drag-dest.h
similarity index 100%
rename from libnautilus-private/nautilus-tree-view-drag-dest.h
rename to src/nautilus-tree-view-drag-dest.h
diff --git a/libnautilus-private/nautilus-ui-utilities.c b/src/nautilus-ui-utilities.c
similarity index 100%
rename from libnautilus-private/nautilus-ui-utilities.c
rename to src/nautilus-ui-utilities.c
diff --git a/libnautilus-private/nautilus-ui-utilities.h b/src/nautilus-ui-utilities.h
similarity index 100%
rename from libnautilus-private/nautilus-ui-utilities.h
rename to src/nautilus-ui-utilities.h
diff --git a/libnautilus-private/nautilus-undo-private.h b/src/nautilus-undo-private.h
similarity index 91%
rename from libnautilus-private/nautilus-undo-private.h
rename to src/nautilus-undo-private.h
index 9cdc0aa..84f03ee 100644
--- a/libnautilus-private/nautilus-undo-private.h
+++ b/src/nautilus-undo-private.h
@@ -22,8 +22,8 @@
#ifndef NAUTILUS_UNDO_PRIVATE_H
#define NAUTILUS_UNDO_PRIVATE_H
-#include <libnautilus-private/nautilus-undo.h>
-#include <libnautilus-private/nautilus-undo-manager.h>
+#include "nautilus-undo.h"
+#include "nautilus-undo-manager.h"
#include <glib-object.h>
NautilusUndoManager * nautilus_undo_get_undo_manager (GObject *attached_object);
diff --git a/libnautilus-private/nautilus-vfs-directory.c b/src/nautilus-vfs-directory.c
similarity index 100%
rename from libnautilus-private/nautilus-vfs-directory.c
rename to src/nautilus-vfs-directory.c
diff --git a/libnautilus-private/nautilus-vfs-directory.h b/src/nautilus-vfs-directory.h
similarity index 97%
rename from libnautilus-private/nautilus-vfs-directory.h
rename to src/nautilus-vfs-directory.h
index 0e5b2ef..621e416 100644
--- a/libnautilus-private/nautilus-vfs-directory.h
+++ b/src/nautilus-vfs-directory.h
@@ -23,7 +23,7 @@
#ifndef NAUTILUS_VFS_DIRECTORY_H
#define NAUTILUS_VFS_DIRECTORY_H
-#include <libnautilus-private/nautilus-directory.h>
+#include "nautilus-directory.h"
#define NAUTILUS_TYPE_VFS_DIRECTORY nautilus_vfs_directory_get_type()
#define NAUTILUS_VFS_DIRECTORY(obj) \
diff --git a/libnautilus-private/nautilus-vfs-file.c b/src/nautilus-vfs-file.c
similarity index 100%
rename from libnautilus-private/nautilus-vfs-file.c
rename to src/nautilus-vfs-file.c
diff --git a/libnautilus-private/nautilus-vfs-file.h b/src/nautilus-vfs-file.h
similarity index 97%
rename from libnautilus-private/nautilus-vfs-file.h
rename to src/nautilus-vfs-file.h
index 5147d74..a6786d9 100644
--- a/libnautilus-private/nautilus-vfs-file.h
+++ b/src/nautilus-vfs-file.h
@@ -23,7 +23,7 @@
#ifndef NAUTILUS_VFS_FILE_H
#define NAUTILUS_VFS_FILE_H
-#include <libnautilus-private/nautilus-file.h>
+#include "nautilus-file.h"
#define NAUTILUS_TYPE_VFS_FILE nautilus_vfs_file_get_type()
#define NAUTILUS_VFS_FILE(obj) \
diff --git a/libnautilus-private/nautilus-video-mime-types.h b/src/nautilus-video-mime-types.h
similarity index 100%
rename from libnautilus-private/nautilus-video-mime-types.h
rename to src/nautilus-video-mime-types.h
diff --git a/src/nautilus-view.h b/src/nautilus-view.h
index 5dd0716..2bc9a13 100644
--- a/src/nautilus-view.h
+++ b/src/nautilus-view.h
@@ -23,7 +23,7 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-query.h>
+#include "nautilus-query.h"
G_BEGIN_DECLS
diff --git a/src/nautilus-window-slot-dnd.h b/src/nautilus-window-slot-dnd.h
index a4897b6..f9de9b0 100644
--- a/src/nautilus-window-slot-dnd.h
+++ b/src/nautilus-window-slot-dnd.h
@@ -29,7 +29,7 @@
#include <gio/gio.h>
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-dnd.h>
+#include "nautilus-dnd.h"
#include "nautilus-window-slot.h"
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 27af46e..76cfeef 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -36,12 +36,12 @@
#include <glib/gi18n.h>
#include <eel/eel-stock-dialogs.h>
-#include <libnautilus-private/nautilus-file.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-module.h>
-#include <libnautilus-private/nautilus-monitor.h>
-#include <libnautilus-private/nautilus-profile.h>
+#include "nautilus-file.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-module.h"
+#include "nautilus-monitor.h"
+#include "nautilus-profile.h"
#include <libnautilus-extension/nautilus-location-widget-provider.h>
enum {
@@ -775,7 +775,7 @@ nautilus_window_slot_init (NautilusWindowSlot *self)
}
#define DEBUG_FLAG NAUTILUS_DEBUG_WINDOW
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
static void begin_location_change (NautilusWindowSlot *slot,
GFile *location,
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 2d2a1fc..936db68 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -51,21 +51,21 @@
#ifdef HAVE_X11_XF86KEYSYM_H
#include <X11/XF86keysym.h>
#endif
-#include <libnautilus-private/nautilus-dnd.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file-attributes.h>
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-file-undo-manager.h>
-#include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-profile.h>
-#include <libnautilus-private/nautilus-clipboard.h>
-#include <libnautilus-private/nautilus-signaller.h>
-#include <libnautilus-private/nautilus-trash-monitor.h>
-#include <libnautilus-private/nautilus-ui-utilities.h>
+#include "nautilus-dnd.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-file-attributes.h"
+#include "nautilus-file-operations.h"
+#include "nautilus-file-undo-manager.h"
+#include "nautilus-global-preferences.h"
+#include "nautilus-metadata.h"
+#include "nautilus-profile.h"
+#include "nautilus-clipboard.h"
+#include "nautilus-signaller.h"
+#include "nautilus-trash-monitor.h"
+#include "nautilus-ui-utilities.h"
#define DEBUG_FLAG NAUTILUS_DEBUG_WINDOW
-#include <libnautilus-private/nautilus-debug.h>
+#include "nautilus-debug.h"
#include <math.h>
#include <sys/time.h>
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index c803df9..b2108db 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -29,8 +29,8 @@
#include <gtk/gtk.h>
#include <eel/eel-glib-extensions.h>
-#include <libnautilus-private/nautilus-bookmark.h>
-#include <libnautilus-private/nautilus-search-directory.h>
+#include "nautilus-bookmark.h"
+#include "nautilus-search-directory.h"
typedef struct NautilusWindow NautilusWindow;
typedef struct NautilusWindowClass NautilusWindowClass;
diff --git a/src/nautilus-x-content-bar.c b/src/nautilus-x-content-bar.c
index 137eb24..af63310 100644
--- a/src/nautilus-x-content-bar.c
+++ b/src/nautilus-x-content-bar.c
@@ -27,9 +27,9 @@
#include <string.h>
#include "nautilus-x-content-bar.h"
-#include <libnautilus-private/nautilus-icon-info.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-program-choosing.h>
+#include "nautilus-icon-info.h"
+#include "nautilus-file-utilities.h"
+#include "nautilus-program-choosing.h"
#define NAUTILUS_X_CONTENT_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
NAUTILUS_TYPE_X_CONTENT_BAR, NautilusXContentBarPrivate))
diff --git a/test/Makefile.am b/test/Makefile.am
index c78212d..9f0bcf0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,10 +12,7 @@ AM_CPPFLAGS =\
$(NULL)
LDADD =\
- $(top_builddir)/libnautilus-private/libnautilus-private.la \
- $(BASE_LIBS) \
- $(COMMON_LIBS) \
- $(NAUTILUS_LIBS) \
+ $(top_builddir)/src/libnautilus.la \
$(NULL)
noinst_PROGRAMS =\
diff --git a/test/test-copy.c b/test/test-copy.c
index d9c491e..428eea7 100644
--- a/test/test-copy.c
+++ b/test/test-copy.c
@@ -1,8 +1,8 @@
#include "test.h"
-#include <libnautilus-private/nautilus-file-operations.h>
-#include <libnautilus-private/nautilus-progress-info.h>
-#include <libnautilus-private/nautilus-progress-info-manager.h>
+#include <src/nautilus-file-operations.h>
+#include <src/nautilus-progress-info.h>
+#include <src/nautilus-progress-info-manager.h>
static void
copy_done (GHashTable *debuting_uris,
diff --git a/test/test-nautilus-directory-async.c b/test/test-nautilus-directory-async.c
index b551bfe..4fbbb32 100644
--- a/test/test-nautilus-directory-async.c
+++ b/test/test-nautilus-directory-async.c
@@ -1,7 +1,7 @@
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-search-directory.h>
-#include <libnautilus-private/nautilus-file.h>
+#include <src/nautilus-directory.h>
+#include <src/nautilus-search-directory.h>
+#include <src/nautilus-file.h>
#include <unistd.h>
void *client1, *client2;
diff --git a/test/test-nautilus-mime-actions-set.c b/test/test-nautilus-mime-actions-set.c
index 6b576a6..b80c317 100644
--- a/test/test-nautilus-mime-actions-set.c
+++ b/test/test-nautilus-mime-actions-set.c
@@ -24,7 +24,7 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-mime-actions.h>
+#include <src/nautilus-mime-actions.h>
#include <stdio.h>
static gboolean ready = FALSE;
diff --git a/test/test-nautilus-mime-actions.c b/test/test-nautilus-mime-actions.c
index ff0b5db..761c4a9 100644
--- a/test/test-nautilus-mime-actions.c
+++ b/test/test-nautilus-mime-actions.c
@@ -24,7 +24,7 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <libnautilus-private/nautilus-mime-actions.h>
+#include <src/nautilus-mime-actions.h>
#include <stdio.h>
static gboolean ready = FALSE;
diff --git a/test/test-nautilus-search-engine.c b/test/test-nautilus-search-engine.c
index 5353a4b..f377180 100644
--- a/test/test-nautilus-search-engine.c
+++ b/test/test-nautilus-search-engine.c
@@ -1,5 +1,5 @@
-#include <libnautilus-private/nautilus-search-provider.h>
-#include <libnautilus-private/nautilus-search-engine.h>
+#include <src/nautilus-search-provider.h>
+#include <src/nautilus-search-engine.h>
#include <gtk/gtk.h>
static void
diff --git a/test/test.h b/test/test.h
index 8bc068f..8d9b8a2 100644
--- a/test/test.h
+++ b/test/test.h
@@ -6,7 +6,7 @@
#include <eel/eel-debug.h>
#include <eel/eel.h>
-#include <libnautilus-private/nautilus-file-utilities.h>
+#include <src/nautilus-file-utilities.h>
void test_init (int *argc,
char ***argv);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
