From a5617016d3e5d8e32ce02708f2c08d09926141d1 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Tue, 29 Apr 2014 16:29:23 +0200
Subject: application: make DBusActivatable

---
 configure.ac                                      |  2 +-
 data/Makefile.am                                  |  6 +++---
 data/nautilus-search-provider.ini                 |  2 +-
 data/nautilus.desktop.in.in                       | 16 ----------------
 data/org.freedesktop.FileManager1.service.in      |  2 +-
 data/org.gnome.Nautilus.SearchProvider.service.in |  2 +-
 data/org.gnome.Nautilus.desktop.in.in             | 17 +++++++++++++++++
 data/org.gnome.Nautilus.service.in                |  2 +-
 8 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 data/nautilus.desktop.in.in
 create mode 100644 data/org.gnome.Nautilus.desktop.in.in

diff --git a/configure.ac b/configure.ac
index 3053fc3c0..2a31ed22f 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 c192ca49c..cf71ffa85 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 0743df87a..2ff7e3a92 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/nautilus.desktop.in.in b/data/nautilus.desktop.in.in
deleted file mode 100644
index 1a14bd701..000000000
--- a/data/nautilus.desktop.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-_Name=Files
-_Comment=Access and organize files
-_Keywords=folder;manager;explore;disk;filesystem;
-Exec=nautilus --new-window %U
-Icon=system-file-manager
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Utility;Core;FileManager;
-MimeType=inode/directory;application/x-gnome-saved-search;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=nautilus
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
-X-GNOME-UsesNotifications=true
diff --git a/data/org.freedesktop.FileManager1.service.in b/data/org.freedesktop.FileManager1.service.in
index 967c33c80..6a0bbe09e 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 85f5a6690..1d10ad2ce 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/org.gnome.Nautilus.desktop.in.in b/data/org.gnome.Nautilus.desktop.in.in
new file mode 100644
index 000000000..013eb9916
--- /dev/null
+++ b/data/org.gnome.Nautilus.desktop.in.in
@@ -0,0 +1,17 @@
+[Desktop Entry]
+_Name=Files
+_Comment=Access and organize files
+_Keywords=folder;manager;explore;disk;filesystem;
+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;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=nautilus
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
+X-GNOME-UsesNotifications=true
diff --git a/data/org.gnome.Nautilus.service.in b/data/org.gnome.Nautilus.service.in
index 46fd15267..48fe6fce2 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
-- 
cgit v1.2.1