Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_container.c e_int_config_display.c Log Message: make res dialog not segv if u dont select refresh rate, make refresh get selected anyway, and re-enable window resize/move to fit onto the screen if you go down a resolution. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_container.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -3 -r1.97 -r1.98 --- e_container.c 5 May 2006 04:47:56 -0000 1.97 +++ e_container.c 10 May 2006 14:29:41 -0000 1.98 @@ -1141,7 +1141,7 @@ { E_Event_Container_Resize *ev; Evas_List *l, *screens; -#if 0 +#if 1 int i; #endif @@ -1186,7 +1186,7 @@ e_gadman_container_resize(con->gadman); e_object_ref(E_OBJECT(con)); ecore_event_add(E_EVENT_CONTAINER_RESIZE, ev, _e_container_event_container_resize_free, NULL); -#if 0 +#if 1 /* FIXME: This is wrong, we should only move/resize to save things from * disappearing! */ =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_int_config_display.c 10 May 2006 08:15:32 -0000 1.7 +++ e_int_config_display.c 10 May 2006 14:29:41 -0000 1.8 @@ -228,8 +228,10 @@ sel_res = (char *)e_widget_ilist_selected_label_get(res_list); sel_rate = (char *)e_widget_ilist_selected_label_get(rate_list); - sscanf(sel_res, "%dx%d", &w, &h); - sscanf(sel_rate, "%d Hz", &r); + if (!sel_res) return 0; + if (!sel_rate) return 0; + sscanf(sel_res, "%ix%i", &w, &h); + sscanf(sel_rate, "%i Hz", &r); e_config->display_res_width = cfdata->orig_size.width; e_config->display_res_height = cfdata->orig_size.height; @@ -374,7 +376,7 @@ if ((res->size.width == size.width) && (res->size.height == size.height)) { - e_widget_ilist_selected_set(ol, sortindex[i]); + e_widget_ilist_selected_set(ol, i); _load_rates(res); } } @@ -405,13 +407,13 @@ e_widget_ilist_clear(rate_list); for (k = 0; k < r; k++) - { - - snprintf(buf, sizeof(buf), "%d Hz", rts[k].rate); + { + snprintf(buf, sizeof(buf), "%i Hz", rts[k].rate); e_widget_ilist_append(rate_list, NULL, buf, NULL, NULL, NULL); if (rt.rate == rts[k].rate) e_widget_ilist_selected_set(rate_list, k); } + e_widget_ilist_selected_set(rate_list, 0); } static void ------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs