[maemo-commits] [maemo-commits] r18402 - projects/haf/trunk/maemo-launcher/launcher

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-05-18 09:44:12 +0300 (Mon, 18 May 2009)
New Revision: 18402

Modified:
   projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c
Log:
no reason to fork on dbus/appdied

Modified: projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c
===================================================================
--- projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c	2009-05-18 05:52:54 UTC (rev 18401)
+++ projects/haf/trunk/maemo-launcher/launcher/comm_dbus.c	2009-05-18 06:44:12 UTC (rev 18402)
@@ -31,10 +31,14 @@
   DBusConnection *conn;
   DBusMessage *msg;
 
+  info("%s: %s pid %d\n", __FUNCTION__, filename, pid );
+
   conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
   if (conn == NULL)
     die(1, "%s: getting dbus bus\n", __FUNCTION__);
 
+  info("%s: bus %x\n", __FUNCTION__, conn);
+
   msg = dbus_message_new_signal(LAUNCHER_PATH,
 				LAUNCHER_IFACE,
 				LAUNCHER_SIGNAL_APP_DIED);
@@ -60,11 +64,18 @@
 void
 comm_send_app_died(char *filename, int pid, int status)
 {
-  if (!fork())
+/*
+  pid_t cpid;
+
+  cpid = fork();
+  if (!cpid)
   {
     comm_dbus_send_app_died(filename, pid, status);
     _exit(0);
   }
+  waitpid(pid);
+*/
+  comm_dbus_send_app_died(filename, pid, status);
 }
 
 #ifdef TEST
@@ -74,7 +85,7 @@
 {
   info("testing comm-dbus layer ... ");
 
-  comm_dbus_send_app_died(LAUNCHER, 1000, 150);
+  comm_dbus_send_app_died("LAUNCHER", 1000, 150);
 
   info("done.\n");