From b851bd8fd378f87dea876b3b471eaaa38e7cc09e Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 9 Feb 2005 10:51:53 +0000 Subject: [PATCH] Add new default folder handler NoDisplay desktop file 2005-02-09 Alexander Larsson * 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) --- ChangeLog | 15 +++++ Makefile.am | 1 + nautilus-folder-handler.desktop.in | 13 ++++ nautilus.desktop.in | 2 +- src/Nautilus_shell.server.in | 94 ---------------------------- src/file-manager/fm-directory-view.c | 4 +- 6 files changed, 33 insertions(+), 96 deletions(-) create mode 100644 nautilus-folder-handler.desktop.in diff --git a/ChangeLog b/ChangeLog index 2fdbfa04e..ac348832f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2005-02-09 Alexander Larsson + + * 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 * src/file-manager/fm-list-view.c: (cell_renderer_edited), diff --git a/Makefile.am b/Makefile.am index 7e1928cc5..b400bf4a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 = \ diff --git a/nautilus-folder-handler.desktop.in b/nautilus-folder-handler.desktop.in new file mode 100644 index 000000000..02d2eed47 --- /dev/null +++ b/nautilus-folder-handler.desktop.in @@ -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; diff --git a/nautilus.desktop.in b/nautilus.desktop.in index b31092ae6..4d92c1da7 100644 --- a/nautilus.desktop.in +++ b/nautilus.desktop.in @@ -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 diff --git a/src/Nautilus_shell.server.in b/src/Nautilus_shell.server.in index a9c8d9d62..61f925e25 100644 --- a/src/Nautilus_shell.server.in +++ b/src/Nautilus_shell.server.in @@ -8,89 +8,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -109,15 +26,4 @@ - - - - - - - - - - - diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 8d655f8dd..dd60ec245 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -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