[maemo-commits] [maemo-commits] r9180 - in projects/haf/trunk/maemo-af-desktop: . hildon-home

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-01-19 11:00:27 +0200 (Fri, 19 Jan 2007)
New Revision: 9180

Modified:
   projects/haf/trunk/maemo-af-desktop/ChangeLog
   projects/haf/trunk/maemo-af-desktop/hildon-home/background-manager.c
Log:

2007-01-19  Johan Bilien <johan.bilien at nokia.com>

	* hildon-home/background-manager.c: Make sure previous child
	worker are killed before spawning a new one. Fixes: NB#49487



Modified: projects/haf/trunk/maemo-af-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/maemo-af-desktop/ChangeLog	2007-01-18 17:34:57 UTC (rev 9179)
+++ projects/haf/trunk/maemo-af-desktop/ChangeLog	2007-01-19 09:00:27 UTC (rev 9180)
@@ -1,3 +1,8 @@
+2007-01-19  Johan Bilien <johan.bilien at nokia.com>
+
+	* hildon-home/background-manager.c: Make sure previous child
+	worker are killed before spawning a new one. Fixes: NB#49487
+
 2006-12-15  Johan Bilien <johan.bilien at nokia.com>
 
 	* hildon-navigator/hn-wm-watched-window.c: Fixed a warning.

Modified: projects/haf/trunk/maemo-af-desktop/hildon-home/background-manager.c
===================================================================
--- projects/haf/trunk/maemo-af-desktop/hildon-home/background-manager.c	2007-01-18 17:34:57 UTC (rev 9179)
+++ projects/haf/trunk/maemo-af-desktop/hildon-home/background-manager.c	2007-01-19 09:00:27 UTC (rev 9180)
@@ -1408,6 +1408,7 @@
         {
           g_debug ("about to kill %i\n", manager->priv->child_pid);
           kill (manager->priv->child_pid, SIGKILL);
+          manager->priv->child_pid = 0;
 
         }
       g_object_set_data (G_OBJECT (dialog),
@@ -1673,6 +1674,13 @@
   pipe (parent_exit_notify);
   pipe (pipe_from_child);
 
+  if (priv->child_pid)
+    {
+      g_debug ("Killing previous child worker: %i", priv->child_pid);
+      kill (priv->child_pid, SIGKILL);
+      priv->child_pid = 0;
+    }
+
   pid = fork ();
   if (pid == 0)
     {