Add new default folder handler NoDisplay desktop file

2005-02-09  Alexander Larsson  <alexl@redhat.com>

	* Makefile.am:
	* nautilus-folder-handler.desktop.in:
	Add new default folder handler NoDisplay desktop file

	* nautilus.desktop.in:
	Add %U to exec line

	* src/Nautilus_shell.server.in:
	Remove all the bonobo components we no longer support

	* src/file-manager/fm-directory-view.c:
	Allow open with menu on folders (#151747)
This commit is contained in:
Alexander Larsson 2005-02-09 10:51:53 +00:00 committed by Alexander Larsson
parent 92b4773b96
commit b851bd8fd3
6 changed files with 33 additions and 96 deletions

View file

@ -1,3 +1,18 @@
2005-02-09 Alexander Larsson <alexl@redhat.com>
* Makefile.am:
* nautilus-folder-handler.desktop.in:
Add new default folder handler NoDisplay desktop file
* nautilus.desktop.in:
Add %U to exec line
* src/Nautilus_shell.server.in:
Remove all the bonobo components we no longer support
* src/file-manager/fm-directory-view.c:
Allow open with menu on folders (#151747)
2005-02-08 Martin Wehner <martin.wehner@epost.de>
* src/file-manager/fm-list-view.c: (cell_renderer_edited),

View file

@ -8,6 +8,7 @@ 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
SUBDIRS = \

View file

@ -0,0 +1,13 @@
[Desktop Entry]
Encoding=UTF-8
Name=Open Folder
TryExec=nautilus
Exec=nautilus %U
NoDisplay=true
Terminal=false
Type=Application
MimeType=x-directory/gnome-default-handler
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=nautilus
X-GNOME-Bugzilla-Component=general
X-Gnome-Bugzilla-OtherBinaries=nautilus-adapter;nautilus-content-loser;nautilus-sidebar-loser;nautilus-text-view;nautilus-throbber;

View file

@ -3,7 +3,7 @@ Encoding=UTF-8
_Name=File Browser
_Comment=Browse the filesystem with the file manager
TryExec=nautilus
Exec=nautilus --no-desktop --browser
Exec=nautilus --no-desktop --browser %U
Icon=file-manager
Terminal=false
Type=Application

View file

@ -8,89 +8,6 @@
<oaf_attribute name="description" type="string" _value="Factory for Nautilus shell and file manager"/>
</oaf_server>
<oaf_server iid="OAFIID:Nautilus_File_Manager_Icon_View" type="factory" location="OAFIID:Nautilus_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Nautilus file manager icon view"/>
<oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows a two-dimensional icon space"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="x-directory/normal"/>
<item value="x-directory/webdav"/>
<item value="x-directory/webdav-prefer-directory"/>
<item value="x-directory/vfolder-desktop"/>
<item value="x-directory/smb-share"/>
</oaf_attribute>
<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv">
<item value="gnome-trash"/>
<item value="trash"/>
<item value="x-nautilus-desktop"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" _value="Icons"/>
<oaf_attribute name="nautilus:view_as_label" type="string" _value="View as Icons"/>
<oaf_attribute name="nautilus:view_as_label_with_mnemonic" type="string" _value="View as _Icons"/>
<oaf_attribute name="nautilus:viewer_label" type="string" _value="Icons Viewer"/>
</oaf_server>
<oaf_server iid="OAFIID:Nautilus_File_Manager_Desktop_Icon_View" type="factory" location="OAFIID:Nautilus_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
<item value="IDL:Bonobo/Zoomable:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Nautilus file manager desktop icon view"/>
<oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows icons on the desktop"/>
<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv">
<item value="x-nautilus-desktop"/>
</oaf_attribute>
</oaf_server>
<oaf_server iid="OAFIID:Nautilus_File_Manager_List_View" type="factory" location="OAFIID:Nautilus_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
<item value="IDL:Bonobo/Zoomable:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Nautilus file manager list view"/>
<oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows a scrollable list"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="x-directory/normal"/>
<item value="x-directory/webdav"/>
<item value="x-directory/webdav-prefer-directory"/>
<item value="x-directory/vfolder-desktop"/>
<item value="x-directory/smb-share"/>
</oaf_attribute>
<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv">
<item value="gnome-trash"/>
<item value="trash"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" _value="List"/>
<oaf_attribute name="nautilus:view_as_label" type="string" _value="View as List"/>
<oaf_attribute name="nautilus:view_as_label_with_mnemonic" type="string" _value="View as _List"/>
<oaf_attribute name="nautilus:viewer_label" type="string" _value="List Viewer"/>
</oaf_server>
<oaf_server iid="OAFIID:Nautilus_File_Manager_Search_List_View" type="factory" location="OAFIID:Nautilus_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
<item value="IDL:Bonobo/Zoomable:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Nautilus file manager search results list view"/>
<oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows a scrollable list for search results"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="x-directory/search"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" _value="Search List"/>
<oaf_attribute name="nautilus:view_as_label" type="string" value="View as Search List"/>
<oaf_attribute name="nautilus:viewer_label" type="string" value="Search List Viewer"/>
</oaf_server>
<oaf_server iid="OAFIID:Nautilus_Shell" type="factory" location="OAFIID:Nautilus_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
@ -109,15 +26,4 @@
<oaf_attribute name="description" type="string" _value="Produces metafile objects for accessing Nautilus metadata"/>
</oaf_server>
<oaf_server iid="OAFIID:Nautilus_File_Manager_Tree_View" type="factory" location="OAFIID:Nautilus_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" _value="Nautilus Tree View"/>
<oaf_attribute name="description" type="string" _value="Nautilus Tree side pane"/>
<oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Tree"/>
</oaf_server>
</oaf_info>

View file

@ -3870,7 +3870,9 @@ reset_open_with_menu (FMDirectoryView *view, GList *selection)
uri = nautilus_file_get_uri (file);
other_applications_visible = !can_use_component_for_file (file);
other_applications_visible =
!can_use_component_for_file (file) ||
nautilus_file_is_directory (file);
action = get_activation_action (file);
/* Only use the default app for open if there is not