[maemo-commits] [maemo-commits] r18773 - in projects/haf/trunk/libmatchbox2: . matchbox/core

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-06-23 02:01:50 +0300 (Tue, 23 Jun 2009)
New Revision: 18773

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
Log:
	NB#122710 Weird screen appearing after closing the camera application
	* matchbox/core/mb-wm-client.c: When a window belongs to us, we
	should never kill its owner!



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-22 09:54:46 UTC (rev 18772)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-06-22 23:01:50 UTC (rev 18773)
@@ -1,3 +1,10 @@
+2009-06-22  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+	NB#122710 Weird screen appearing after closing the camera application
+	
+	* matchbox/core/mb-wm-client.c: When a window belongs to us, we
+	should never kill its owner!
+
 2009-06-22  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.43

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-06-22 09:54:46 UTC (rev 18772)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-06-22 23:01:50 UTC (rev 18773)
@@ -864,6 +864,13 @@
     {
       if (!strcmp (buf, machine))
 	{
+	  if (pid==getpid())
+	    {
+	      /* attempting to nuke ourselves; see NB#122710. */
+	      g_warning ("Window manager may not kill itself\n");
+	      return;
+	    }
+
           g_debug ("%s: kill(%u)", __FUNCTION__, pid);
 	  if (kill (pid, sig) >= 0)
 	    return;