Author: kelnos
Date: 2008-10-17 09:05:07 +0000 (Fri, 17 Oct 2008)
New Revision: 28277

Modified:
   xfce4-session/trunk/ChangeLog
   xfce4-session/trunk/xfce4-session/xfsm-manager.c
Log:
    * xfce4-session/xfsm-manager.c: Don't ditch clients that fail
      to restart solely because fork() failed in xfce4-session.

Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog       2008-10-17 08:50:40 UTC (rev 28276)
+++ xfce4-session/trunk/ChangeLog       2008-10-17 09:05:07 UTC (rev 28277)
@@ -1,5 +1,10 @@
 2008-10-17     Brian Tarricone <[EMAIL PROTECTED]>
 
+       * xfce4-session/xfsm-manager.c: Don't ditch clients that fail
+         to restart solely because fork() failed in xfce4-session.
+
+2008-10-17     Brian Tarricone <[EMAIL PROTECTED]>
+
        * xfce4-session/ice-layer.c: Properly initialise a GError to
          NULL.  Patch from Carlos Santos (bug 4202).
        * libxfsm/Makefile.am: Link all used libraries to libxfsm.so

Modified: xfce4-session/trunk/xfce4-session/xfsm-manager.c
===================================================================
--- xfce4-session/trunk/xfce4-session/xfsm-manager.c    2008-10-17 08:50:40 UTC 
(rev 28276)
+++ xfce4-session/trunk/xfce4-session/xfsm-manager.c    2008-10-17 09:05:07 UTC 
(rev 28277)
@@ -374,22 +374,9 @@
 
           if (G_UNLIKELY (!xfsm_startup_start_properties (properties, 
manager)))
             {
-              xfsm_verbose ("Client Id = %s failed to restart; removing from 
client "
-                            "list and running discard command\n",
-                            properties->client_id);
-
-              /* FIXME: should we just re-add it to the list of restart
-               * properties and hope we're able to start it next session? */
-              if (properties->discard_command != NULL)
-                {
-                  g_spawn_sync (properties->current_directory,
-                                properties->discard_command,
-                                properties->environment,
-                                G_SPAWN_SEARCH_PATH,
-                                NULL, NULL, NULL, NULL, NULL, NULL);
-                }
-
-              return FALSE;
+              /* this failure has nothing to do with the app itself, so
+               * just add it to restart props */
+              g_queue_push_tail (manager->restart_properties, properties);
             }
           else
             {

_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to