From aa78ab6cb030bde10a655736086ac2d4b9524e8a Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Fri, 6 Apr 2007 11:02:17 +0000 Subject: [PATCH] Check that desktop is valid (+return) before we freeze evas so we don't leave it in a frozen state. SVN revision: 29417 --- src/bin/e_int_config_apps_menu.c | 7 +++---- src/bin/e_int_config_apps_order.c | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/bin/e_int_config_apps_menu.c b/src/bin/e_int_config_apps_menu.c index 5173f3f98..55b8fb2c4 100644 --- a/src/bin/e_int_config_apps_menu.c +++ b/src/bin/e_int_config_apps_menu.c @@ -236,15 +236,14 @@ _cb_add(void *data, void *data2) cfdata = data; if (!cfdata->menu) return; if (e_widget_ilist_selected_get(cfdata->o_apps) < 0) return; + desk = efreet_desktop_get(cfdata->app); + if (!desk) return; evas = evas_object_evas_get(cfdata->o_list); evas_event_freeze(evas); edje_freeze(); e_widget_ilist_freeze(cfdata->o_list); - - desk = efreet_desktop_get(cfdata->app); - if (!desk) return; - icon = e_util_desktop_icon_add(desk, "24x24", evas_object_evas_get(cfdata->o_list)); + icon = e_util_desktop_icon_add(desk, "24x24", evas); e_widget_ilist_append(cfdata->o_list, icon, desk->name, _list_cb_selected, cfdata, cfdata->app); e_widget_ilist_go(cfdata->o_list); diff --git a/src/bin/e_int_config_apps_order.c b/src/bin/e_int_config_apps_order.c index 941fd49f1..896e94441 100644 --- a/src/bin/e_int_config_apps_order.c +++ b/src/bin/e_int_config_apps_order.c @@ -288,15 +288,13 @@ _cb_add(void *data, void *data2) once = data2; if (e_widget_ilist_selected_get(cfdata->o_apps) < 0) return; + desk = efreet_desktop_get(cfdata->app); + if (!desk) return; evas = evas_object_evas_get(cfdata->o_list); evas_event_freeze(evas); edje_freeze(); e_widget_ilist_freeze(cfdata->o_list); - - desk = efreet_desktop_get(cfdata->app); - if (!desk) return; - e_util_desktop_icon_add(desk, "24x24", evas); e_widget_ilist_append(cfdata->o_list, icon, desk->name, _list_cb_selected, cfdata, cfdata->app);