[nautilus] application: make DBusActivatable

[Cosimo Cecchi <cosimoc src gnome org>]

commit a5617016d3e5d8e32ce02708f2c08d09926141d1
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Apr 29 16:29:23 2014 +0200

    application: make DBusActivatable

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    6 +++---
 data/nautilus-search-provider.ini                  |    2 +-
 data/org.freedesktop.FileManager1.service.in       |    2 +-
 data/org.gnome.Nautilus.SearchProvider.service.in  |    2 +-
 ...ktop.in.in => org.gnome.Nautilus.desktop.in.in} |    1 +
 data/org.gnome.Nautilus.service.in                 |    2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3053fc3..2a31ed2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,7 +312,7 @@ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-data/nautilus.desktop.in
+data/org.gnome.Nautilus.desktop.in
 data/nautilus-autorun-software.desktop.in
 data/nautilus-classic.desktop
 data/nautilus-connect-server.desktop.in
diff --git a/data/Makefile.am b/data/Makefile.am
index c192ca4..cf71ffa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,7 +9,7 @@ desktop_DATA     =                                      \
        $(desktop_in_files:.desktop.in=.desktop)        \
        nautilus-classic.desktop
 desktop_in_files =                                     \
-       nautilus.desktop.in                             \
+       org.gnome.Nautilus.desktop.in                           \
        nautilus-autorun-software.desktop.in            \
        nautilus-connect-server.desktop.in
 
@@ -54,8 +54,8 @@ nautilusdata_DATA = \
        $(NULL)
 
 EXTRA_DIST = $(nautilusdata_DATA)      \
-       nautilus.desktop                \
-       nautilus.desktop.in             \
+       org.gnome.Nautilus.desktop      \
+       org.gnome.Nautilus.desktop.in   \
        dbus-interfaces.xml             \
        freedesktop-dbus-interfaces.xml \
        shell-search-provider-dbus-interfaces.xml \
diff --git a/data/nautilus-search-provider.ini b/data/nautilus-search-provider.ini
index 0743df8..2ff7e3a 100644
--- a/data/nautilus-search-provider.ini
+++ b/data/nautilus-search-provider.ini
@@ -1,5 +1,5 @@
 [Shell Search Provider]
-DesktopId=nautilus.desktop
+DesktopId=org.gnome.Nautilus.desktop
 BusName=org.gnome.Nautilus.SearchProvider
 ObjectPath=/org/gnome/Nautilus/SearchProvider
 Version=2
diff --git a/data/org.freedesktop.FileManager1.service.in b/data/org.freedesktop.FileManager1.service.in
index 967c33c..6a0bbe0 100644
--- a/data/org.freedesktop.FileManager1.service.in
+++ b/data/org.freedesktop.FileManager1.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.FileManager1
-Exec= bindir@/nautilus --no-default-window
+Exec= bindir@/nautilus --gapplication-service
diff --git a/data/org.gnome.Nautilus.SearchProvider.service.in 
b/data/org.gnome.Nautilus.SearchProvider.service.in
index 85f5a66..1d10ad2 100644
--- a/data/org.gnome.Nautilus.SearchProvider.service.in
+++ b/data/org.gnome.Nautilus.SearchProvider.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.Nautilus.SearchProvider
-Exec= bindir@/nautilus --no-default-window
+Exec= bindir@/nautilus --gapplication-service
diff --git a/data/nautilus.desktop.in.in b/data/org.gnome.Nautilus.desktop.in.in
similarity index 95%
rename from data/nautilus.desktop.in.in
rename to data/org.gnome.Nautilus.desktop.in.in
index 1a14bd7..013eb99 100644
--- a/data/nautilus.desktop.in.in
+++ b/data/org.gnome.Nautilus.desktop.in.in
@@ -6,6 +6,7 @@ Exec=nautilus --new-window %U
 Icon=system-file-manager
 Terminal=false
 Type=Application
+DBusActivatable=true
 StartupNotify=true
 Categories=GNOME;GTK;Utility;Core;FileManager;
 MimeType=inode/directory;application/x-gnome-saved-search;
diff --git a/data/org.gnome.Nautilus.service.in b/data/org.gnome.Nautilus.service.in
index 46fd152..48fe6fc 100644
--- a/data/org.gnome.Nautilus.service.in
+++ b/data/org.gnome.Nautilus.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.Nautilus
-Exec= bindir@/nautilus --no-default-window
\ No newline at end of file
+Exec= bindir@/nautilus --gapplication-service