From 06dda37076c6e5b222f868a46fe84c070a04d680 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Thu, 23 Apr 2009 14:29:21 +0200 Subject: Move desktop files into data/ Move desktop files into data/ subdirectory, so that they not clutter the top source dir. --- Makefile.am | 16 ---------------- configure.in | 14 +++++++------- data/Makefile.am | 22 +++++++++++++++++++--- data/nautilus-autorun-software.desktop.in.in | 15 +++++++++++++++ data/nautilus-browser.desktop.in.in | 16 ++++++++++++++++ data/nautilus-computer.desktop.in.in | 16 ++++++++++++++++ ...utilus-file-management-properties.desktop.in.in | 15 +++++++++++++++ data/nautilus-folder-handler.desktop.in.in | 16 ++++++++++++++++ data/nautilus-home.desktop.in.in | 15 +++++++++++++++ data/nautilus.desktop.in.in | 18 ++++++++++++++++++ nautilus-autorun-software.desktop.in.in | 15 --------------- nautilus-browser.desktop.in.in | 16 ---------------- nautilus-computer.desktop.in.in | 16 ---------------- nautilus-file-management-properties.desktop.in.in | 15 --------------- nautilus-folder-handler.desktop.in.in | 16 ---------------- nautilus-home.desktop.in.in | 15 --------------- nautilus.desktop.in.in | 18 ------------------ 17 files changed, 137 insertions(+), 137 deletions(-) create mode 100644 data/nautilus-autorun-software.desktop.in.in create mode 100644 data/nautilus-browser.desktop.in.in create mode 100644 data/nautilus-computer.desktop.in.in create mode 100644 data/nautilus-file-management-properties.desktop.in.in create mode 100644 data/nautilus-folder-handler.desktop.in.in create mode 100644 data/nautilus-home.desktop.in.in create mode 100644 data/nautilus.desktop.in.in delete mode 100644 nautilus-autorun-software.desktop.in.in delete mode 100644 nautilus-browser.desktop.in.in delete mode 100644 nautilus-computer.desktop.in.in delete mode 100644 nautilus-file-management-properties.desktop.in.in delete mode 100644 nautilus-folder-handler.desktop.in.in delete mode 100644 nautilus-home.desktop.in.in delete mode 100644 nautilus.desktop.in.in diff --git a/Makefile.am b/Makefile.am index 194e1c706..0522c2fe8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,18 +1,5 @@ include $(top_srcdir)/Makefile.shared -@INTLTOOL_DESKTOP_RULE@ - -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-file-management-properties.desktop.in \ - nautilus-browser.desktop.in \ - nautilus-autorun-software.desktop.in - SUBDIRS = \ eel \ libnautilus-extension \ @@ -47,11 +34,8 @@ EXTRA_DIST= \ intltool-update.in \ Makefile.shared \ add-include-prefix \ - $(desktop_in_files) \ $(NULL) -CLEANFILES = $(desktop_DATA) - DISTCLEANFILES = \ intltool-extract \ intltool-merge \ diff --git a/configure.in b/configure.in index 54f47e21a..bad35e76e 100644 --- a/configure.in +++ b/configure.in @@ -472,6 +472,13 @@ cut-n-paste-code/libegg/Makefile data/Makefile data/icons/Makefile data/patterns/Makefile +data/nautilus-computer.desktop.in +data/nautilus-file-management-properties.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 docs/reference/libnautilus-extension/Makefile @@ -482,13 +489,6 @@ libnautilus-private/Makefile libnautilus-extension/Makefile libnautilus-extension/libnautilus-extension.pc libnautilus-extension/libnautilus-extension-uninstalled.pc -nautilus-computer.desktop.in -nautilus-file-management-properties.desktop.in -nautilus-home.desktop.in -nautilus.desktop.in -nautilus-folder-handler.desktop.in -nautilus-browser.desktop.in -nautilus-autorun-software.desktop.in po/Makefile.in src/Makefile src/file-manager/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 293441139..4d6a2222b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,6 +4,19 @@ xml_in_files = nautilus.xml.in xml_files = $(xml_in_files:.xml.in=.xml) @INTLTOOL_XML_RULE@ +@INTLTOOL_DESKTOP_RULE@ + +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-file-management-properties.desktop.in \ + nautilus-browser.desktop.in \ + nautilus-autorun-software.desktop.in + mimedir = $(datadir)/mime/packages mime_DATA = $(xml_files) @@ -15,11 +28,14 @@ nautilusdata_DATA = \ nautilus-suggested.placeholder \ $(NULL) -EXTRA_DIST = $(nautilusdata_DATA) \ - $(xml_in_files) \ +EXTRA_DIST = $(nautilusdata_DATA) \ + $(xml_in_files) \ + $(desktop_in_files) \ $(NULL) -CLEANFILES = $(xml_files) +CLEANFILES = $(xml_files) \ + $(desktop_DATA) \ + $(NULL) SUBDIRS = \ icons \ diff --git a/data/nautilus-autorun-software.desktop.in.in b/data/nautilus-autorun-software.desktop.in.in new file mode 100644 index 000000000..b3c48ef2c --- /dev/null +++ b/data/nautilus-autorun-software.desktop.in.in @@ -0,0 +1,15 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=Autorun Prompt +TryExec=nautilus-autorun-software +Exec=nautilus-autorun-software %u +Icon=application-x-executable +NoDisplay=true +Terminal=false +StartupNotify=true +Type=Application +MimeType=x-content/software; +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-browser.desktop.in.in b/data/nautilus-browser.desktop.in.in new file mode 100644 index 000000000..ef7d18da1 --- /dev/null +++ b/data/nautilus-browser.desktop.in.in @@ -0,0 +1,16 @@ +[Desktop Entry] +Encoding=UTF-8 +_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 new file mode 100644 index 000000000..aed78eeb1 --- /dev/null +++ b/data/nautilus-computer.desktop.in.in @@ -0,0 +1,16 @@ +[Desktop Entry] +Encoding=UTF-8 +_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-file-management-properties.desktop.in.in b/data/nautilus-file-management-properties.desktop.in.in new file mode 100644 index 000000000..a696c8181 --- /dev/null +++ b/data/nautilus-file-management-properties.desktop.in.in @@ -0,0 +1,15 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=File Management +_Comment=Change the behaviour and appearance of file manager windows +Exec=nautilus-file-management-properties +Icon=system-file-manager +Terminal=false +Type=Application +StartupNotify=true +Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings; +OnlyShowIn=GNOME; +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=nautilus +X-GNOME-Bugzilla-Component=Preferences +X-GNOME-Bugzilla-Version=@VERSION@ diff --git a/data/nautilus-folder-handler.desktop.in.in b/data/nautilus-folder-handler.desktop.in.in new file mode 100644 index 000000000..ce89ed75b --- /dev/null +++ b/data/nautilus-folder-handler.desktop.in.in @@ -0,0 +1,16 @@ +[Desktop Entry] +Encoding=UTF-8 +_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 new file mode 100644 index 000000000..c84218129 --- /dev/null +++ b/data/nautilus-home.desktop.in.in @@ -0,0 +1,15 @@ +[Desktop Entry] +Encoding=UTF-8 +_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 new file mode 100644 index 000000000..d3aa07709 --- /dev/null +++ b/data/nautilus.desktop.in.in @@ -0,0 +1,18 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=File Manager +Exec=nautilus +Icon=system-file-manager +Terminal=false +Type=Application +StartupNotify=true +NoDisplay=true +OnlyShowIn=GNOME; +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=nautilus +X-GNOME-Bugzilla-Component=general +X-GNOME-Bugzilla-Version=@VERSION@ +X-GNOME-Autostart-Phase=Desktop +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true +X-GNOME-Provides=filemanager diff --git a/nautilus-autorun-software.desktop.in.in b/nautilus-autorun-software.desktop.in.in deleted file mode 100644 index b3c48ef2c..000000000 --- a/nautilus-autorun-software.desktop.in.in +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=Autorun Prompt -TryExec=nautilus-autorun-software -Exec=nautilus-autorun-software %u -Icon=application-x-executable -NoDisplay=true -Terminal=false -StartupNotify=true -Type=Application -MimeType=x-content/software; -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=nautilus -X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=@VERSION@ diff --git a/nautilus-browser.desktop.in.in b/nautilus-browser.desktop.in.in deleted file mode 100644 index ef7d18da1..000000000 --- a/nautilus-browser.desktop.in.in +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_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/nautilus-computer.desktop.in.in b/nautilus-computer.desktop.in.in deleted file mode 100644 index aed78eeb1..000000000 --- a/nautilus-computer.desktop.in.in +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_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/nautilus-file-management-properties.desktop.in.in b/nautilus-file-management-properties.desktop.in.in deleted file mode 100644 index a696c8181..000000000 --- a/nautilus-file-management-properties.desktop.in.in +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=File Management -_Comment=Change the behaviour and appearance of file manager windows -Exec=nautilus-file-management-properties -Icon=system-file-manager -Terminal=false -Type=Application -StartupNotify=true -Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings; -OnlyShowIn=GNOME; -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=nautilus -X-GNOME-Bugzilla-Component=Preferences -X-GNOME-Bugzilla-Version=@VERSION@ diff --git a/nautilus-folder-handler.desktop.in.in b/nautilus-folder-handler.desktop.in.in deleted file mode 100644 index ce89ed75b..000000000 --- a/nautilus-folder-handler.desktop.in.in +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_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/nautilus-home.desktop.in.in b/nautilus-home.desktop.in.in deleted file mode 100644 index c84218129..000000000 --- a/nautilus-home.desktop.in.in +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_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/nautilus.desktop.in.in b/nautilus.desktop.in.in deleted file mode 100644 index d3aa07709..000000000 --- a/nautilus.desktop.in.in +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=File Manager -Exec=nautilus -Icon=system-file-manager -Terminal=false -Type=Application -StartupNotify=true -NoDisplay=true -OnlyShowIn=GNOME; -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=nautilus -X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=@VERSION@ -X-GNOME-Autostart-Phase=Desktop -X-GNOME-Autostart-Notify=true -X-GNOME-AutoRestart=true -X-GNOME-Provides=filemanager -- cgit v1.2.1