On 11/11/2012 09:27 PM, Enlightenment SVN wrote: > Log: > handle the 0 copied files case... but... no thana - dont change the > return value. it WAITS for efreet to be happy and give an update > event. this event doesnt come and thats currently some efreet bug.
As I said, works here (tm). I get events both on page 000 and page 040. Is this a problem on a fast or slow device? efreetd does not queue cache build requests, so if a build is going on which wont change anything you wont get this event. S. > > > > Author: raster > Date: 2012-11-11 12:27:55 -0800 (Sun, 11 Nov 2012) > New Revision: 79120 > Trac: http://trac.enlightenment.org/e/changeset/79120 > > Modified: > trunk/e/src/modules/wizard/page_000.c trunk/e/src/modules/wizard/page_040.c > > Modified: trunk/e/src/modules/wizard/page_000.c > =================================================================== > --- trunk/e/src/modules/wizard/page_000.c 2012-11-11 20:20:43 UTC (rev > 79119) > +++ trunk/e/src/modules/wizard/page_000.c 2012-11-11 20:27:55 UTC (rev > 79120) > @@ -17,6 +17,8 @@ > { > if (_update_handler) ecore_event_handler_del(_update_handler); > _update_handler = NULL; > + if (_next_timer) ecore_timer_del(_next_timer); > + _next_timer = NULL; > return 1; > } > > @@ -34,6 +36,8 @@ > static Eina_Bool > _cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev > __UNUSED__) > { > + if (_update_handler) ecore_event_handler_del(_update_handler); > + _update_handler = NULL; > if (_next_timer) ecore_timer_del(_next_timer); > _next_timer = ecore_timer_add(2.0, _next_page, NULL); > return ECORE_CALLBACK_PASS_ON; > > Modified: trunk/e/src/modules/wizard/page_040.c > =================================================================== > --- trunk/e/src/modules/wizard/page_040.c 2012-11-11 20:20:43 UTC (rev > 79119) > +++ trunk/e/src/modules/wizard/page_040.c 2012-11-11 20:27:55 UTC (rev > 79120) > @@ -16,6 +16,8 @@ > { > if (_update_handler) ecore_event_handler_del(_update_handler); > _update_handler = NULL; > + if (_next_timer) ecore_timer_del(_next_timer); > + _next_timer = NULL; > return 1; > } > > @@ -33,6 +35,8 @@ > static Eina_Bool > _cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev > __UNUSED__) > { > + if (_update_handler) ecore_event_handler_del(_update_handler); > + _update_handler = NULL; > if (_next_timer) ecore_timer_del(_next_timer); > _next_timer = ecore_timer_add(1.0, _next_page, NULL); > return ECORE_CALLBACK_PASS_ON; > @@ -44,7 +48,7 @@ > Eina_List *extra_desks, *desks; > Efreet_Desktop *desk, *extra_desk; > char buf[PATH_MAX], *file; > - int found; > + int found, copies = 0; > > e_wizard_title_set(_("Adding missing App files")); > e_wizard_button_next_enable_set(0); > @@ -110,13 +114,22 @@ > "%s/applications/%s", > efreet_data_home_get(), file); > ecore_file_cp(buf, abuf); > + copies++; > } > } > efreet_desktop_free(extra_desk); > } > free(file); > } > - return 0; /* 1 == show ui, and wait for user, 0 == just continue */ > + if (copies == 0) > + { > + if (_next_timer) ecore_timer_del(_next_timer); > + _next_timer = NULL; > + if (_update_handler) ecore_event_handler_del(_update_handler); > + _update_handler = NULL; > + return 0; /* we didnt copy anything so advance anyway */ > + } > + return 1; /* 1 == show ui, and wait for user, 0 == just continue */ > } > > EAPI int > > > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_d2d_nov > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_nov _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
