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

[From: subversion at stage.maemo.org]

Author: akojo
Date: 2009-07-07 12:06:40 +0300 (Tue, 07 Jul 2009)
New Revision: 18841

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
Log:
Applied Laszlo's patch.

Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-03 09:10:35 UTC (rev 18840)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-07-07 09:06:40 UTC (rev 18841)
@@ -1,3 +1,12 @@
+2009-07-07  Aapo Kojo <aapo.kojo at nokia.com>
+
+	Patch from Laszlo Pere.
+
+	* matchbox/core/mb-wm-client.c:
+	 If this transient already has a registered transient parent we 
+	 need to remove the link from the parent.
+	 Fixes: NB#125222 - Hildon-desktop crashed when image opened from File Manager.
+
 2009-07-03  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	* matchbox/core/mb-wm-types.h

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-07-03 09:10:35 UTC (rev 18840)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-07-07 09:06:40 UTC (rev 18841)
@@ -1,6 +1,7 @@
 matchbox-window-manager-2 (0.2.46-1~unreleased) unstable; urgency=low
 
-  * foo
+  Laszlo:
+  * Fixes: NB#125222 - Hildon-desktop crashed when image opened from File Manager.
 
  -- Aapo Kojo <aapo.kojo at nokia.com>  Mon, 29 Jun 2009 10:48:48 +0300
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-07-03 09:10:35 UTC (rev 18840)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client.c	2009-07-07 09:06:40 UTC (rev 18841)
@@ -582,6 +582,13 @@
   if (transient == NULL || client == NULL)
     return;
 
+  /*
+   * If this transient already has a registered transient parent we need to
+   * remove the link from the parent.
+   */
+  if (transient->transient_for) 
+    mb_wm_client_remove_transient (transient->transient_for, transient);
+
   transient->transient_for = client;
 
   /*