[maemo-commits] [maemo-commits] r14978 - in projects/haf/trunk/maemo-launcher: . launcher

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2007-12-14 20:16:22 +0200 (Fri, 14 Dec 2007)
New Revision: 14978

Modified:
   projects/haf/trunk/maemo-launcher/ChangeLog
   projects/haf/trunk/maemo-launcher/launcher/launcher.c
Log:
Move handling of invoked_send_fake_exit from kindergarten_insert_child to main


Modified: projects/haf/trunk/maemo-launcher/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-14 13:48:45 UTC (rev 14977)
+++ projects/haf/trunk/maemo-launcher/ChangeLog	2007-12-14 18:16:22 UTC (rev 14978)
@@ -1,3 +1,10 @@
+2007-12-14  Guillem Jover  <guillem.jover at nokia.com>
+
+	* launcher/launcher.c (kindergarten_insert_child): Do not call
+	invoked_send_fake_exit on failure.
+	(main): If kindergarten_insert_child failed call
+	invoked_send_fake_exit.
+
 2007-12-07  Guillem Jover  <guillem.jover at nokia.com>
 
 	* launcher/launcher.c (child_clone): New function.

Modified: projects/haf/trunk/maemo-launcher/launcher/launcher.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-12-14 13:48:45 UTC (rev 14977)
+++ projects/haf/trunk/maemo-launcher/launcher/launcher.c	2007-12-14 18:16:22 UTC (rev 14978)
@@ -465,7 +465,6 @@
   {
     error("cannot make a bigger kindergarten, not tracking child %d\n",
 	  child->pid);
-    invoked_send_fake_exit(child->sock);
     return false;
   }
 
@@ -474,7 +473,6 @@
   {
     error("this cannot be happening! no free slots on the kindergarten,\n"
 	  "not tracking child %d\n", child->pid);
-    invoked_send_fake_exit(child->sock);
     return false;
   }
 
@@ -852,7 +850,8 @@
 	child.sock = sd;
 	child.name = prog.name;
 
-	kindergarten_insert_child(kg, &child);
+	if (!kindergarten_insert_child(kg, &child))
+	  invoked_send_fake_exit(child->sock);
       }
       else
 	close(sd);