From 3abf0ce65a8652748ad26ffc4664f41f0e641ebc Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 28 Dec 2012 09:51:40 +0000
Subject: [PATCH] forwardport previous commit for genlist fixing

SVN revision: 81790
---
 legacy/elementary/ChangeLog             |  4 ++++
 legacy/elementary/NEWS                  |  1 +
 legacy/elementary/src/lib/elm_genlist.c | 12 +++++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index c51f095bcb..869faaab6c 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -853,3 +853,7 @@
 2012-12-27  Jiyoun Park (jypark)
 
 	* elm_photocam returns file_set error properly.
+
+2012-12-28  Mike Blumenkrantz
+
+        * Fix bug where genlist would delete items added during selection callback if a clear was queued
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index a9451370bd..61875b70ef 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -105,6 +105,7 @@ Fixes:
    * Fix the image to show the image right now if the image preloading is disabled.
    * Fix typo from elm_plug signal "image.deleted", should be "image,deleted".
    * Fix photocam returns file set error correctly.
+   * Fix bug where genlist would delete items added during selection callback if a clear was queued
 
 Removals:
 
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 10ea4835d1..1bca888874 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -4854,13 +4854,15 @@ _elm_genlist_clear(Evas_Object *obj,
      }
    sd->clear_me = EINA_FALSE;
    sd->pan_changed = EINA_TRUE;
-   if (sd->calc_job)
+   if (!sd->queue)
      {
-        ecore_job_del(sd->calc_job);
-        sd->calc_job = NULL;
+        if (sd->calc_job)
+          {
+             ecore_job_del(sd->calc_job);
+             sd->calc_job = NULL;
+          }
+        _clear(sd);
      }
-   if (sd->selected) sd->selected = eina_list_free(sd->selected);
-   _clear(sd);
    sd->pan_x = 0;
    sd->pan_y = 0;
    sd->minw = 0;