Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_int_config_apps_menu.c e_int_config_apps_order.c 


Log Message:
Check that desktop is valid (+return) before we freeze evas so we don't
leave it in a frozen state.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps_menu.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_apps_menu.c    6 Apr 2007 10:27:48 -0000       1.7
+++ e_int_config_apps_menu.c    6 Apr 2007 11:02:17 -0000       1.8
@@ -236,15 +236,14 @@
    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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps_order.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_apps_order.c   6 Apr 2007 10:32:49 -0000       1.4
+++ e_int_config_apps_order.c   6 Apr 2007 11:02:17 -0000       1.5
@@ -288,15 +288,13 @@
    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);



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to