From 5432a415dadbd8db34081037645e0c38457900ec Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Mon, 19 Dec 2016 20:12:41 -0500 Subject: Show "open with" menu for desktop and theme files Apply https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-4&id=b9c51fd4eb84a9f52ee4be1bf183fc516984130b via https://gist.github.com/raveit65/19cfc5fe706ac6a2ea5d663a94fb02af --- libcaja-private/caja-mime-actions.c | 6 ++---- src/file-manager/fm-directory-view.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c index 46e3bdc3..b52279f7 100644 --- a/libcaja-private/caja-mime-actions.c +++ b/libcaja-private/caja-mime-actions.c @@ -860,9 +860,7 @@ get_default_executable_text_file_action (void) gboolean caja_mime_file_opens_in_view (CajaFile *file) { - return (caja_file_is_directory (file) || - CAJA_IS_DESKTOP_ICON_FILE (file) || - caja_file_is_caja_link (file)); + return (caja_file_is_directory (file)); } static ActivationAction @@ -871,7 +869,7 @@ get_activation_action (CajaFile *file) ActivationAction action; char *activation_uri; - if (caja_file_is_launcher (file)) + if (caja_file_is_caja_link (file)) { return ACTIVATION_ACTION_LAUNCH_DESKTOP_FILE; } diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index d4c41628..ba7a59db 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -4712,9 +4712,7 @@ reset_open_with_menu (FMDirectoryView *view, GList *selection) file = CAJA_FILE (node->data); - other_applications_visible &= - (!caja_mime_file_opens_in_view (file) || - caja_file_is_directory (file)); + other_applications_visible &= (!caja_file_is_directory (file)); } default_app = NULL; -- cgit v1.2.1