desktop-files: cleanup desktop files installed by nautilus

In the 3.0 world, nautilus doesn't have to install a hundred of desktop
files, as it's just a regular application.
Tweak the default desktop file to make it suitable for being the only
one, and remove the others.

6 files changed, 4 insertions, 65 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 66dc3395e..6720abb10 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,10 +8,6 @@ desktopdir       = $(datadir)/applications
 desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 desktop_in_files = 					\
 	nautilus.desktop.in				\
-	nautilus-home.desktop.in			\
-	nautilus-computer.desktop.in			\
-	nautilus-folder-handler.desktop.in		\
-	nautilus-browser.desktop.in                     \
 	nautilus-autorun-software.desktop.in
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/data/nautilus-browser.desktop.in.in b/data/nautilus-browser.desktop.in.in
deleted file mode 100644
index 4675fa3b2..000000000
--- a/data/nautilus-browser.desktop.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-_Name=File Browser
-_Comment=Browse the file system with the file manager
-TryExec=nautilus
-Exec=nautilus --no-desktop --browser %U
-Icon=system-file-manager
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=GNOME;GTK;System;Utility;Core;
-OnlyShowIn=GNOME;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=nautilus
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/data/nautilus-computer.desktop.in.in b/data/nautilus-computer.desktop.in.in
deleted file mode 100644
index b35e11aa6..000000000
--- a/data/nautilus-computer.desktop.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-_Name=Computer
-_Comment=Browse all local and remote disks and folders accessible from this computer
-TryExec=nautilus
-Exec=nautilus --no-desktop computer:
-Icon=computer
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=GNOME;GTK;Core;
-OnlyShowIn=GNOME;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=nautilus
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/data/nautilus-folder-handler.desktop.in.in b/data/nautilus-folder-handler.desktop.in.in
deleted file mode 100644
index 70f4a1039..000000000
--- a/data/nautilus-folder-handler.desktop.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-_Name=Open Folder
-TryExec=nautilus
-Exec=nautilus --no-desktop %U
-NoDisplay=true
-Terminal=false
-Icon=folder-open
-StartupNotify=true
-Type=Application
-MimeType=x-directory/gnome-default-handler;x-directory/normal;inode/directory;application/x-gnome-saved-search;
-OnlyShowIn=GNOME;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=nautilus
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/data/nautilus-home.desktop.in.in b/data/nautilus-home.desktop.in.in
deleted file mode 100644
index bf692fee5..000000000
--- a/data/nautilus-home.desktop.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-_Name=Home Folder
-_Comment=Open your personal folder
-TryExec=nautilus
-Exec=nautilus --no-desktop
-Icon=user-home
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=GNOME;GTK;Core;
-OnlyShowIn=GNOME;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=nautilus
-X-GNOME-Bugzilla-Component=general
diff --git a/data/nautilus.desktop.in.in b/data/nautilus.desktop.in.in
index 33ae3cc39..db94cfcdb 100644
--- a/data/nautilus.desktop.in.in
+++ b/data/nautilus.desktop.in.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
 _Name=File Manager
-Exec=nautilus
+_Comment=Manage files on your computer and network locations
+Exec=nautilus %U
 Icon=system-file-manager
 Terminal=false
 Type=Application
 StartupNotify=true
 OnlyShowIn=GNOME;
-Categories=GNOME;GTK;Utility;System;
+Categories=GNOME;GTK;Utility;System;Core;
+MimeType=x-directory/gnome-default-handler;x-directory/normal;inode/directory;application/x-gnome-saved-search;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=nautilus
 X-GNOME-Bugzilla-Component=general