Fix update of references.

SVN revision: 66337
This commit is contained in:
Leif Middelschulte 2011-12-19 17:42:02 +00:00
parent 2812e15939
commit bdb55d1364
2 changed files with 10 additions and 16 deletions

View File

@ -325,6 +325,7 @@ _dialog_subdialog_arrangement_output_mouse_down_cb(void *data __UNUSED__, Evas *
edje_object_signal_emit(element, "select", "e"); edje_object_signal_emit(element, "select", "e");
//update data for other dialogs //update data for other dialogs
e_config_runtime_info->gui.selected_eo = obj; e_config_runtime_info->gui.selected_eo = obj;
e_config_runtime_info->gui.selected_output_dd = evas_object_data_get(obj, "output_info");
//update resolutions list //update resolutions list
dialog_subdialog_resolutions_update_list(obj); dialog_subdialog_resolutions_update_list(obj);
@ -342,6 +343,7 @@ _dialog_subdialog_arrangement_output_mouse_down_cb(void *data __UNUSED__, Evas *
{ {
//update data for other dialogs //update data for other dialogs
e_config_runtime_info->gui.selected_eo = NULL; e_config_runtime_info->gui.selected_eo = NULL;
e_config_runtime_info->gui.selected_output_dd = NULL;
//update resolutions list //update resolutions list
dialog_subdialog_resolutions_update_list(NULL); dialog_subdialog_resolutions_update_list(NULL);

View File

@ -207,7 +207,7 @@ dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Co
Eina_Bool Eina_Bool
dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
if (!e_randr_screen_info || !cfdata || !cfdata->gui.selected_output_dd) return EINA_FALSE; if (!e_randr_screen_info || !cfdata || !cfdata->gui.selected_output_dd || !cfdata->gui.selected_output_dd->output) return EINA_FALSE;
return (int)cfdata->gui.selected_output_dd->previous_policy != (int)cfdata->gui.subdialogs.policies.radio_val; return (int)cfdata->gui.selected_output_dd->previous_policy != (int)cfdata->gui.subdialogs.policies.radio_val;
} }
@ -285,29 +285,21 @@ void
dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfdata) dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfdata)
{ {
E_Config_Randr_Dialog_Output_Dialog_Data *odd; E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter; if (!cfdata || !cfdata->gui.selected_output_dd || !cfdata->gui.selected_output_dd->output) return;
if (!cfdata) return; odd = cfdata->gui.selected_output_dd;
odd->previous_policy = odd->new_policy;
EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) odd->output->policy = odd->new_policy;
{
odd->previous_policy = odd->new_policy;
if (odd->output)
odd->output->policy = odd->new_policy;
}
} }
void void
dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *cfdata) dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *cfdata)
{ {
E_Config_Randr_Dialog_Output_Dialog_Data *odd; E_Config_Randr_Dialog_Output_Dialog_Data *odd;
Eina_List *iter;
if (!cfdata) return; if (!cfdata || !cfdata->gui.selected_output_dd || !cfdata->gui.selected_output_dd->output) return;
EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) odd = cfdata->gui.selected_output_dd;
{ odd->new_policy = odd->previous_policy;
odd->new_policy = odd->previous_policy;
}
} }