[nautilus] view: show applications for non launcher desktop files

[Cosimo Cecchi <cosimoc src gnome org>]

commit b9c51fd4eb84a9f52ee4be1bf183fc516984130b
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Mar 7 14:14:10 2012 -0500

    view: show applications for non launcher desktop files
    
    https://bugzilla.gnome.org/show_bug.cgi?id=319981

 src/nautilus-mime-actions.c |    5 ++---
 src/nautilus-view.c         |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 1358624..41f1347 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -759,8 +759,7 @@ gboolean
 nautilus_mime_file_opens_in_view (NautilusFile *file)
 {
   return (nautilus_file_is_directory (file) ||
-	  NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
-	  nautilus_file_is_nautilus_link (file));
+	  NAUTILUS_IS_DESKTOP_ICON_FILE (file));
 }
 
 static ActivationAction
@@ -769,7 +768,7 @@ get_activation_action (NautilusFile *file)
 	ActivationAction action;
 	char *activation_uri;
 
-	if (nautilus_file_is_launcher (file)) {
+	if (nautilus_file_is_nautilus_link (file)) {
 		return ACTIVATION_ACTION_LAUNCH_DESKTOP_FILE;
 	}
 	
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 2e45261..1be5be9 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -4491,9 +4491,8 @@ reset_open_with_menu (NautilusView *view, GList *selection)
 
 		file = NAUTILUS_FILE (node->data);
 
-		other_applications_visible &=
-			(!nautilus_mime_file_opens_in_view (file) ||
-			 nautilus_file_is_directory (file));
+		other_applications_visible &= (!nautilus_mime_file_opens_in_view (file) &&
+					       !nautilus_file_is_nautilus_link (file));
 	}
 
 	default_app = NULL;