From 282a978df4a6dbe4fab79dcfa62a663e4085bbba Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 10 May 2006 14:29:41 +0000 Subject: [PATCH] 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. SVN revision: 22517 --- src/bin/e_container.c | 4 ++-- src/bin/e_int_config_display.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/bin/e_container.c b/src/bin/e_container.c index e43bddce0..4f9c9257a 100644 --- a/src/bin/e_container.c +++ b/src/bin/e_container.c @@ -1141,7 +1141,7 @@ _e_container_resize_handle(E_Container *con) { E_Event_Container_Resize *ev; Evas_List *l, *screens; -#if 0 +#if 1 int i; #endif @@ -1186,7 +1186,7 @@ _e_container_resize_handle(E_Container *con) 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! */ diff --git a/src/bin/e_int_config_display.c b/src/bin/e_int_config_display.c index 3c0b3b19d..c680c6651 100644 --- a/src/bin/e_int_config_display.c +++ b/src/bin/e_int_config_display.c @@ -228,8 +228,10 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf 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 @@ _load_rates(void *data) 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