mime-actions: move nautilus-mime-actions to src/

12 files changed, 46 insertions, 40 deletions

diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 4548460f1..88c628af4 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -120,8 +120,6 @@ libnautilus_private_la_SOURCES = \
 	nautilus-merged-directory.h \
 	nautilus-metadata.h \
 	nautilus-metadata.c \
-	nautilus-mime-actions.c \
-	nautilus-mime-actions.h \
 	nautilus-mime-application-chooser.c \
 	nautilus-mime-application-chooser.h \
 	nautilus-module.c \
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c
index e2e791e44..25b99b276 100644
--- a/libnautilus-private/nautilus-program-choosing.c
+++ b/libnautilus-private/nautilus-program-choosing.c
@@ -26,7 +26,6 @@
 #include <config.h>
 #include "nautilus-program-choosing.h"
 
-#include "nautilus-mime-actions.h"
 #include "nautilus-global-preferences.h"
 #include "nautilus-icon-info.h"
 #include "nautilus-recent.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 8b0335160..aac8971ef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,6 +86,8 @@ nautilus_SOURCES = \
 	nautilus-location-entry.c               \
 	nautilus-location-entry.h               \
 	nautilus-main.c 			\
+	nautilus-mime-actions.c 		\
+	nautilus-mime-actions.h 		\
 	nautilus-navigation-action.c		\
 	nautilus-navigation-action.h		\
 	nautilus-navigation-bar.c         	\
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index af0353d64..abd72fd46 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -5,6 +5,7 @@ noinst_LTLIBRARIES=libnautilus-file-manager.la
 INCLUDES = 					\
 	-I$(top_srcdir) 			\
 	-I$(top_srcdir)/cut-n-paste-code	\
+	-I$(top_srcdir)/src			\
 	$(BASE_CFLAGS)				\
 	$(COMMON_CFLAGS)			\
 	$(NAUTILUS_CFLAGS)			\
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 173938b75..a6d63d8ad 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -28,15 +28,23 @@
  */
 
 #include <config.h>
-#include <math.h>
+
 #include "fm-directory-view.h"
+
 #include "fm-list-view.h"
 #include "fm-desktop-icon-view.h"
-
 #include "fm-actions.h"
 #include "fm-error-reporting.h"
 #include "fm-marshal.h"
 #include "fm-properties-window.h"
+#include "nautilus-mime-actions.h"
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+#include <math.h>
 
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gnome-extensions.h>
@@ -45,12 +53,7 @@
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <gio/gio.h>
-#include <libnautilus-private/nautilus-recent.h>
+
 #include <libnautilus-extension/nautilus-menu-provider.h>
 #include <libnautilus-private/nautilus-clipboard.h>
 #include <libnautilus-private/nautilus-clipboard-monitor.h>
@@ -64,11 +67,11 @@
 #include <libnautilus-private/nautilus-file-dnd.h>
 #include <libnautilus-private/nautilus-file-operations.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
-#include <libnautilus-private/nautilus-file-private.h> /* for nautilus_file_get_existing_by_uri */
+#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-mime-actions.h>
+#include <libnautilus-private/nautilus-recent.h>
 #include <libnautilus-private/nautilus-module.h>
 #include <libnautilus-private/nautilus-program-choosing.h>
 #include <libnautilus-private/nautilus-trash-monitor.h>
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 9c8318d40..f9ad57ee5 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -23,13 +23,23 @@
 */
 
 #include <config.h>
+
 #include "fm-properties-window.h"
+
 #include "fm-ditem-page.h"
+#include "fm-error-reporting.h"
+#include "nautilus-mime-actions.h"
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <cairo.h>
 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
+#include <libgnome-desktop/gnome-desktop-thumbnail.h>
 
-#include "fm-error-reporting.h"
-#include "libnautilus-private/nautilus-mime-application-chooser.h"
 #include <eel/eel-accessibility.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <eel/eel-glib-extensions.h>
@@ -38,10 +48,7 @@
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
-#include <libgnome-desktop/gnome-desktop-thumbnail.h>
+
 #include <libnautilus-extension/nautilus-property-page-provider.h>
 #include <libnautilus-private/nautilus-entry.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
@@ -50,13 +57,10 @@
 #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 <libnautilus-private/nautilus-undo-signal-handlers.h>
-#include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-undo.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <cairo.h>
 
 #if HAVE_SYS_VFS_H
 #include <sys/vfs.h>
diff --git a/libnautilus-private/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index e41398af3..bd785f5ab 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -33,17 +33,17 @@
 #include <string.h>
 #include <gdk/gdkx.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-desktop-icon-file.h"
-#include "nautilus-global-preferences.h"
-#include "nautilus-signaller.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-desktop-icon-file.h>
+#include <libnautilus-private/nautilus-global-preferences.h>
+#include <libnautilus-private/nautilus-signaller.h>
 
 #define DEBUG_FLAG NAUTILUS_DEBUG_MIME
-#include "nautilus-debug.h"
+#include <libnautilus-private/nautilus-debug.h>
 
 typedef enum {
 	ACTIVATION_ACTION_LAUNCH_DESKTOP_FILE,
diff --git a/libnautilus-private/nautilus-mime-actions.h b/src/nautilus-mime-actions.h
index 5fd7839c9..5fd7839c9 100644
--- a/libnautilus-private/nautilus-mime-actions.h
+++ b/src/nautilus-mime-actions.h
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index d0d390ee7..84441b53f 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -59,7 +59,6 @@
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-icon-info.h>
 #include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-program-choosing.h>
 #include <libnautilus-private/nautilus-view-factory.h>
 #include <libnautilus-private/nautilus-clipboard.h>
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 139854097..cccc5a400 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -54,7 +54,6 @@
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-program-choosing.h>
 #include <libnautilus-private/nautilus-undo.h>
 #include <libnautilus-private/nautilus-search-directory.h>
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 796885205..8760353cb 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -57,7 +57,6 @@
 #include <libnautilus-private/nautilus-file.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-module.h>
 #include <libnautilus-private/nautilus-monitor.h>
 #include <libnautilus-private/nautilus-search-directory.h>
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 147f15d76..8f38204b2 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -28,19 +28,22 @@
 /* nautilus-window.c: Implementation of the main window object */
 
 #include <config.h>
+
 #include "nautilus-window-private.h"
 
 #include "nautilus-actions.h"
 #include "nautilus-application.h"
 #include "nautilus-bookmarks-window.h"
+#include "nautilus-mime-actions.h"
+#include "nautilus-navigation-window-pane.h"
+#include "nautilus-navigation-window-slot.h"
+#include "nautilus-search-bar.h"
+#include "nautilus-src-marshal.h"
 #include "nautilus-window-manage-views.h"
 #include "nautilus-window-bookmarks.h"
 #include "nautilus-window-slot.h"
-#include "nautilus-navigation-window-slot.h"
 #include "nautilus-zoom-control.h"
-#include "nautilus-search-bar.h"
-#include "nautilus-navigation-window-pane.h"
-#include "nautilus-src-marshal.h"
+
 #include <eel/eel-debug.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
@@ -56,7 +59,6 @@
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-mime-actions.h>
 #include <libnautilus-private/nautilus-program-choosing.h>
 #include <libnautilus-private/nautilus-view-factory.h>
 #include <libnautilus-private/nautilus-clipboard.h>