From b936d5287e7cd0fdaea98a59569c5d163a38c8db Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Mon, 11 Feb 2013 14:35:03 +0000
Subject: [PATCH] fix e_layout to not ignore frozen state

SVN revision: 83827
---
 ChangeLog          | 1 +
 NEWS               | 1 +
 src/bin/e_layout.c | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2853a9604..315328f09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
         * fixed bug where pointer warping to new clients would start at a random location
         * fix crash when locking screen from Start gadget and then activating gadget again
+        * fixed bug where e_layout would ignore frozen state and crash
 
 2013-02-08 Cedric Bail
 
diff --git a/NEWS b/NEWS
index 0c820c23e..fa0ba5ee2 100644
--- a/NEWS
+++ b/NEWS
@@ -170,3 +170,4 @@ Fixes:
     * don't call efreet_menu_parse from a thread
     * fixed bug where pointer warping to new clients would start at a random location
     * fix crash when locking screen from Start gadget and then activating gadget again
+    * fixed bug where e_layout would ignore frozen state and crash
diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c
index ad7ddd424..389299ddd 100644
--- a/src/bin/e_layout.c
+++ b/src/bin/e_layout.c
@@ -138,7 +138,7 @@ e_layout_pack(Evas_Object *obj, Evas_Object *child)
    sd = evas_object_smart_data_get(obj);
    li = _e_layout_smart_adopt(sd, child);
    sd->items = eina_inlist_append(sd->items, EINA_INLIST_GET(li));
-   _e_layout_smart_move_resize_item(li);
+   if (sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
 }
 
 EAPI void
@@ -151,7 +151,7 @@ e_layout_child_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    if ((li->x == x) && (li->y == y)) return;
    li->x = x;
    li->y = y;
-   _e_layout_smart_move_resize_item(li);
+   if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
 }
 
 EAPI void
@@ -166,7 +166,7 @@ e_layout_child_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
    if ((li->w == w) && (li->h == h)) return;
    li->w = w;
    li->h = h;
-   _e_layout_smart_move_resize_item(li);
+   if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
 }
 
 EAPI void
@@ -464,7 +464,7 @@ _e_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
    sd->w = w;
    sd->h = h;
    sd->changed = 1;
-   _e_layout_smart_reconfigure(sd);
+   if (sd->frozen <= 0) _e_layout_smart_reconfigure(sd);
 }
 
 static void