[Xfce4-commits] r22677 - in thunar/trunk: . thunar

[Benedikt Meurer]

Author: benny
Date: 2006-08-06 20:38:25 +0000 (Sun, 06 Aug 2006)
New Revision: 22677

Modified:
   thunar/trunk/ChangeLog
   thunar/trunk/thunar/thunar-launcher.c
Log:
2006-08-06	Benedikt Meurer <benny at xfce.org>

	* thunar/thunar-launcher.c(thunar_launcher_update): Place additional
	  "Open With" action into a submenu if either more than 2 are available
	  or the default action for the file is "Execute".




Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog	2006-08-06 19:24:04 UTC (rev 22676)
+++ thunar/trunk/ChangeLog	2006-08-06 20:38:25 UTC (rev 22677)
@@ -1,5 +1,11 @@
 2006-08-06	Benedikt Meurer <benny at xfce.org>
 
+	* thunar/thunar-launcher.c(thunar_launcher_update): Place additional
+	  "Open With" action into a submenu if either more than 2 are available
+	  or the default action for the file is "Execute".
+
+2006-08-06	Benedikt Meurer <benny at xfce.org>
+
 	* thunar-vfs/thunar-vfs-thumb.c
 	  (thunar_vfs_thumb_factory_lookup_thumbnail): Fix an invalid return
 	  value.

Modified: thunar/trunk/thunar/thunar-launcher.c
===================================================================
--- thunar/trunk/thunar/thunar-launcher.c	2006-08-06 19:24:04 UTC (rev 22676)
+++ thunar/trunk/thunar/thunar-launcher.c	2006-08-06 20:38:25 UTC (rev 22677)
@@ -876,8 +876,10 @@
                         NULL);
         }
 
-      /* place the other applications in the "Open With" submenu if we have more than 2 other applications */
-      if (G_UNLIKELY (g_list_length (applications) > 3))
+      /* place the other applications in the "Open With" submenu if we have more than 2 other applications, or the
+       * default action for the file is "Execute", in which case the "Open With" actions aren't that relevant either
+       */
+      if (G_UNLIKELY (g_list_length (applications) > 2 || n_executables == n_selected_files))
         {
           /* determine the base paths for the actions */
           file_menu_path = "/main-menu/file-menu/placeholder-launcher/open-with-menu/placeholder-applications";