gnome-session r4631 - in trunk: . gnome-session

[lucasr svn gnome org]

Author: lucasr
Date: Mon Mar 31 21:14:35 2008
New Revision: 4631
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4631&view=rev

Log:
2008-03-31  Lucas Rocha  <lucasr gnome org>

	* gnome-session/app-autostart.c (is_disabled): Call
	egg_desktop_file_can_launch() to check OnlyShowIn/NotShowIn and
	TryExec. #525184, Owen Taylor. Patch by Dan Winship.


Modified:
   trunk/ChangeLog
   trunk/gnome-session/app-autostart.c

Modified: trunk/gnome-session/app-autostart.c
==============================================================================
--- trunk/gnome-session/app-autostart.c	(original)
+++ trunk/gnome-session/app-autostart.c	Mon Mar 31 21:14:35 2008
@@ -136,6 +136,14 @@
       return TRUE;
     }
 
+  /* Check OnlyShowIn/NotShowIn/TryExec */
+  if (!egg_desktop_file_can_launch (app->desktop_file, "GNOME"))
+    {
+      g_debug ("app %s not installed or not for GNOME",
+	       gsm_app_get_basename (app));
+      return TRUE;
+    }
+
   /* Check AutostartCondition */
   condition = egg_desktop_file_get_string (app->desktop_file,
 					   "AutostartCondition",