gdm r5892 - in trunk: . daemon

[halfline svn gnome org]

Author: halfline
Date: Thu Feb 28 20:28:17 2008
New Revision: 5892
URL: http://svn.gnome.org/viewvc/gdm?rev=5892&view=rev

Log:
2008-02-28  Ray Strode  <rstrode redhat com>

	* daemon/gdm-session-direct.c
	(get_session_command_for_file):
	Don't bail if TryExec isn't set. It's optional.


Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-session-direct.c

Modified: trunk/daemon/gdm-session-direct.c
==============================================================================
--- trunk/daemon/gdm-session-direct.c	(original)
+++ trunk/daemon/gdm-session-direct.c	Thu Feb 28 20:28:17 2008
@@ -909,22 +909,19 @@
                 goto out;
         }
 
-        error = NULL;
         exec = g_key_file_get_string (key_file,
                                       G_KEY_FILE_DESKTOP_GROUP,
                                       G_KEY_FILE_DESKTOP_KEY_TRY_EXEC,
-                                      &error);
-        if (exec == NULL) {
-                g_debug ("GdmSessionDirect: %s key not found", G_KEY_FILE_DESKTOP_KEY_TRY_EXEC);
-                goto out;
-        }
-
-        res = is_prog_in_path (exec);
-        g_free (exec);
-
-        if (! res) {
-                g_debug ("GdmSessionDirect: Command not found: %s", G_KEY_FILE_DESKTOP_KEY_TRY_EXEC);
-                goto out;
+                                      NULL);
+        if (exec != NULL) {
+                res = is_prog_in_path (exec);
+                g_free (exec);
+
+                if (! res) {
+                        g_debug ("GdmSessionDirect: Command not found: %s",
+                                 G_KEY_FILE_DESKTOP_KEY_TRY_EXEC);
+                        goto out;
+                }
         }
 
         error = NULL;