[EGIT] [core/enlightenment] master 10/17: bugfix: comp matching correctly edits in place and doesn't crash

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=d1fb844db058d429d284d2b96d816f0acd2b4a00

commit d1fb844db058d429d284d2b96d816f0acd2b4a00
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Thu Jan 30 10:44:28 2014 -0500

    bugfix: comp matching correctly edits in place and doesn't crash
---
 src/bin/e_int_config_comp_match.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/bin/e_int_config_comp_match.c 
b/src/bin/e_int_config_comp_match.c
index 849920f..793656b 100644
--- a/src/bin/e_int_config_comp_match.c
+++ b/src/bin/e_int_config_comp_match.c
@@ -230,7 +230,6 @@ _edit_ok(void *d1, void *d2)
    Match_Config *m = d1;
    Evas_Object *dia, *bg, *of = d2;
    Evas_Object *il;
-   int n;
 
    if (m->title || m->name || m->clas || m->role)
      {
@@ -266,22 +265,22 @@ _edit_ok(void *d1, void *d2)
         m->match.argb = m->argb;
         m->match.fullscreen = m->fullscreen;
         m->match.modal = m->modal;
-
         il = m->cfd->cfdata->edit_il;
-        if (il == m->cfd->cfdata->popups_il)
-          m->cfd->cfdata->popups = eina_list_append(m->cfd->cfdata->popups, m);
-        else if (il == m->cfd->cfdata->borders_il)
-          m->cfd->cfdata->borders = eina_list_append(m->cfd->cfdata->borders, 
m);
-        else if (il == m->cfd->cfdata->overrides_il)
-          m->cfd->cfdata->overrides = 
eina_list_append(m->cfd->cfdata->overrides, m);
-        else if (il == m->cfd->cfdata->menus_il)
-          m->cfd->cfdata->menus = eina_list_append(m->cfd->cfdata->menus, m);
-        else if (il == m->cfd->cfdata->objects_il)
-          m->cfd->cfdata->objects = eina_list_append(m->cfd->cfdata->objects, 
m);
-        _match_ilist_append(il, m, -1, 0);
-        n = e_widget_ilist_count(il);
-        e_widget_ilist_nth_show(il, n - 1, 0);
-        e_widget_ilist_selected_set(il, n - 1);
+        {
+           const Eina_List *l;
+           E_Ilist_Item *ili;
+
+           EINA_LIST_FOREACH(e_widget_ilist_items_get(il), l, ili)
+             {
+                char *txt;
+
+                if (e_widget_ilist_item_data_get(ili) != m) continue;
+                txt = _match_label_get(m);
+                e_ilist_item_label_set(ili, txt);
+                free(txt);
+                break;
+             }
+        }
      }
    bg = evas_object_data_get(of, "bg");
    dia = evas_object_data_get(of, "dia");

--