elementary : Backport 83001.

SVN revision: 83003

diff --git a/ChangeLog b/ChangeLog
index e21c8ebd55db0116257e94c5a4a4fb694e62d4ce..2abf667fca01560cd7503beaf17563e7a4721fa4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -719,3 +719,7 @@
 2013-01-17  Bora Hwang (bora1.hwang@samsung.com)
 
         * when parent of ctxpopup is resized, ctxpopup calls dismissed signal
+
+2013-01-19  WooHyun Jung
+
+        * When string in entry is changed, access to sd should be forbidden after smart_callback_call is called.

diff --git a/NEWS b/NEWS
index 1328940664d9914dc0944b9817e8748933316f63..e863431a65c9950d2c50b131605640f1f423157e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Changes since Elementary 1.7.5:
 Fixes:
 
    * when parent of ctxpopup is resized, ctxpopup calls dismissed signal.
+   * When string in entry is changed, access to sd should be forbidden after smart_callback_call is called.
 
 Elementary 1.7.5
 

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index b09ec94f153f2eb9c0d9071a50e81b7d6875b136..26a7e4c32e01dfddad0ed14374adb09b2ce51843 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1630,9 +1630,7 @@ _entry_changed_common_handling(void *data, const char *event)
    evas_event_thaw_eval(evas_object_evas_get(data));
    if ((wd->autosave) && (wd->file))
      wd->delay_write = ecore_timer_add(2.0, _delay_write, data);
-   /* callback - this could call callbacks that delete the entry... thus...
-    * any access to wd after this could be invalid */
-   evas_object_smart_callback_call(data, event, NULL);
+
    _check_enable_return_key(data);
    text = edje_object_part_text_get(wd->ent, "elm.text");
    if (text)
@@ -1642,6 +1640,9 @@ _entry_changed_common_handling(void *data, const char *event)
         else
           _elm_entry_update_guide(data, EINA_FALSE);
      }
+   /* callback - this could call callbacks that delete the entry... thus...
+    * any access to wd after this could be invalid */
+   evas_object_smart_callback_call(data, event, NULL);
 }
 
 static void