[nautilus] dbus: move NautilusDBusManager to src/

[Cosimo Cecchi <cosimoc src gnome org>]

commit 94445571c7324a7fdc76a5899e37f11ca83766c5
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Apr 28 22:59:13 2014 -0700

    dbus: move NautilusDBusManager to src/
    
    Don't know why it wasn't there already...

 libnautilus-private/Makefile.am                    |   18 ------------------
 src/Makefile.am                                    |   17 ++++++++++++++++-
 src/nautilus-application.c                         |    2 +-
 .../nautilus-dbus-manager.c                        |    0
 .../nautilus-dbus-manager.h                        |    0
 5 files changed, 17 insertions(+), 20 deletions(-)
---
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 0717986..df31a39 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -17,20 +17,6 @@ AM_CPPFLAGS =                                                \
        -DNAUTILUS_EXTENSIONDIR=\""$(libdir)/nautilus/extensions-3.0"\" \
        $(NULL)
 
-dbus_built_sources = nautilus-generated.c nautilus-generated.h
-$(dbus_built_sources) : Makefile.am $(top_srcdir)/data/dbus-interfaces.xml
-       gdbus-codegen                                                                   \
-               --interface-prefix org.gnome.Nautilus.                                  \
-               --c-namespace NautilusDBus                                              \
-               --c-generate-object-manager                                             \
-               --generate-c-code nautilus-generated                                    \
-               $(top_srcdir)/data/dbus-interfaces.xml                                  \
-               $(NULL)
-
-BUILT_SOURCES = \
-       $(dbus_built_sources) \
-       $(NULL)
-
 if ENABLE_TRACKER
 nautilus_tracker_engine_sources = \
        nautilus-search-engine-tracker.c \
@@ -70,8 +56,6 @@ libnautilus_private_la_SOURCES = \
        nautilus-column-chooser.h \
        nautilus-column-utilities.c \
        nautilus-column-utilities.h \
-       nautilus-dbus-manager.c \
-       nautilus-dbus-manager.h \
        nautilus-debug.c \
        nautilus-debug.h \
        nautilus-default-file-icon.c \
@@ -113,8 +97,6 @@ libnautilus_private_la_SOURCES = \
        nautilus-file-utilities.h \
        nautilus-file.c \
        nautilus-file.h \
-       nautilus-generated.c \
-       nautilus-generated.h \
        nautilus-global-preferences.c \
        nautilus-global-preferences.h \
        nautilus-icon-info.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a67f7a..3b7a225 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,6 +42,19 @@ LDADD =\
        $(POPT_LIBS) \
        $(NULL)
 
+dbus_built_sources =                                   \
+       nautilus-generated.c                            \
+       nautilus-generated.h
+
+$(dbus_built_sources) : Makefile.am $(top_srcdir)/data/dbus-interfaces.xml
+       gdbus-codegen                                                                   \
+               --interface-prefix org.gnome.Nautilus.                                  \
+               --c-namespace NautilusDBus                                              \
+               --c-generate-object-manager                                             \
+               --generate-c-code nautilus-generated                                    \
+               $(top_srcdir)/data/dbus-interfaces.xml                                  \
+               $(NULL)
+
 dbus_freedesktop_built_sources =                       \
        nautilus-freedesktop-generated.c                \
        nautilus-freedesktop-generated.h
@@ -117,6 +130,7 @@ nautilus-enum-types.c: $(headers) Makefile
        && rm -f xgen-gtc
 
 nautilus_built_sources = \
+       $(dbus_built_sources) \
        $(dbus_freedesktop_built_sources) \
        $(dbus_shell_search_provider_built_sources) \
        nautilus-resources.c \
@@ -141,6 +155,8 @@ nautilus_SOURCES = \
        nautilus-canvas-view-container.h        \
        nautilus-connect-server-dialog.c        \
        nautilus-connect-server-dialog.h        \
+       nautilus-dbus-manager.c                 \
+       nautilus-dbus-manager.h                 \
        nautilus-desktop-canvas-view.c          \
        nautilus-desktop-canvas-view.h          \
        nautilus-desktop-item-properties.c      \
@@ -235,7 +251,6 @@ nautilus_convert_metadata_SOURCES= \
 
 BUILT_SOURCES =                                        \
        $(nautilus_built_sources)                       \
-       $(dbus_shell_search_provider_built_sources)     \
        $(NULL)
 
 TESTS=check-nautilus
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 73ce713..ac1486f 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -32,6 +32,7 @@
 #include "nautilus-application-actions.h"
 #include "nautilus-bookmarks-window.h"
 #include "nautilus-connect-server-dialog.h"
+#include "nautilus-dbus-manager.h"
 #include "nautilus-desktop-window.h"
 #include "nautilus-freedesktop-dbus.h"
 #include "nautilus-image-properties-page.h"
@@ -43,7 +44,6 @@
 #include "nautilus-window-private.h"
 #include "nautilus-window-slot.h"
 
-#include <libnautilus-private/nautilus-dbus-manager.h>
 #include <libnautilus-private/nautilus-directory-private.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-operations.h>
diff --git a/libnautilus-private/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
similarity index 100%
rename from libnautilus-private/nautilus-dbus-manager.c
rename to src/nautilus-dbus-manager.c
diff --git a/libnautilus-private/nautilus-dbus-manager.h b/src/nautilus-dbus-manager.h
similarity index 100%
rename from libnautilus-private/nautilus-dbus-manager.h
rename to src/nautilus-dbus-manager.h