[nautilus] desktop-files: cleanup desktop files installed by nautilus

[Cosimo Cecchi <cosimoc src gnome org>]

commit a22f2501c8c00f16150d1de98d7039063a4e002a
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Jan 11 18:48:48 2011 +0100

    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.

 configure.in                               |    4 ----
 data/Makefile.am                           |    4 ----
 data/nautilus-browser.desktop.in.in        |   15 ---------------
 data/nautilus-computer.desktop.in.in       |   15 ---------------
 data/nautilus-folder-handler.desktop.in.in |   15 ---------------
 data/nautilus-home.desktop.in.in           |   14 --------------
 data/nautilus.desktop.in.in                |    6 ++++--
 po/POTFILES.in                             |    5 -----
 src/Makefile.am                            |   11 -----------
 src/network-scheme.desktop.in              |   11 -----------
 10 files changed, 4 insertions(+), 96 deletions(-)
---
diff --git a/configure.in b/configure.in
index 6167a92..ca6d67e 100644
--- a/configure.in
+++ b/configure.in
@@ -342,11 +342,7 @@ cut-n-paste-code/Makefile
 cut-n-paste-code/libegg/Makefile
 data/Makefile
 data/icons/Makefile
-data/nautilus-computer.desktop.in
-data/nautilus-home.desktop.in
 data/nautilus.desktop.in
-data/nautilus-folder-handler.desktop.in
-data/nautilus-browser.desktop.in
 data/nautilus-autorun-software.desktop.in
 docs/Makefile
 docs/reference/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 66dc339..6720abb 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.desktop.in.in b/data/nautilus.desktop.in.in
index 33ae3cc..db94cfc 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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9cb0d0d..9fe5b05 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,10 +40,6 @@ libnautilus-private/nautilus-undo-signal-handlers.c
 libnautilus-private/nautilus-vfs-file.c
 libnautilus-private/org.gnome.nautilus.gschema.xml.in
 data/nautilus-autorun-software.desktop.in.in
-data/nautilus-browser.desktop.in.in
-data/nautilus-computer.desktop.in.in
-data/nautilus-folder-handler.desktop.in.in
-data/nautilus-home.desktop.in.in
 data/nautilus.desktop.in.in
 src/nautilus-desktop-icon-view-ui.xml
 src/nautilus-directory-view-ui.xml
@@ -98,5 +94,4 @@ src/nautilus-window-toolbars.c
 src/nautilus-window.c
 src/nautilus-x-content-bar.c
 src/nautilus-zoom-control.c
-src/network-scheme.desktop.in
 nautilus-sendto-extension/nautilus-nste.c
diff --git a/src/Makefile.am b/src/Makefile.am
index c8dce4e..52f4204 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,15 +43,6 @@ LDADD =\
 	$(POPT_LIBS) \
 	$(NULL)
 
- INTLTOOL_DESKTOP_RULE@
-
-desktop_in_files=network-scheme.desktop.in
-desktop_files=$(desktop_in_files:.desktop.in=.desktop)
-desktopdir = $(datadir)/gnome/network/
-
-schemedir = $(datadir)/applications
-scheme_DATA = network-scheme.desktop
-
 BUILT_SOURCES = \
 	nautilus-src-marshal.c \
 	nautilus-src-marshal.h \
@@ -234,7 +225,6 @@ ui_DATA = 					\
 CLEANFILES = \
 	nautilus-src-marshal.list		\
 	$(BUILT_SOURCES)			\
-	$(desktop_files)			\
 	$(server_DATA)				\
 	$(NULL)
 
@@ -243,7 +233,6 @@ EXTRA_DIST =					\
 	$(server_in_files)			\
 	$(ui_DATA)				\
 	check-nautilus				\
-	$(desktop_in_files)			\
 	$(NULL)
 
 dist-hook: