prevent shelf artifacts when re-creating shelf after config

ticket #2005


SVN revision: 81224
This commit is contained in:
Mike Blumenkrantz 2012-12-18 09:20:32 +00:00
parent 8f5cdde1b3
commit adae1d9000
1 changed files with 4 additions and 0 deletions

View File

@ -369,6 +369,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
} }
} }
e_gadcon_unpopulate(cfdata->es->gadcon);
if (recreate) if (recreate)
{ {
E_Zone *zone; E_Zone *zone;
@ -377,11 +378,14 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
zone = cfdata->es->zone; zone = cfdata->es->zone;
cf_es = cfdata->es->cfg; cf_es = cfdata->es->cfg;
cfdata->es->config_dialog = NULL; cfdata->es->config_dialog = NULL;
e_shelf_hide(cfdata->es);
e_object_del(E_OBJECT(cfdata->es)); e_object_del(E_OBJECT(cfdata->es));
cfdata->es = e_shelf_config_new(zone, cf_es); cfdata->es = e_shelf_config_new(zone, cf_es);
cfdata->es->config_dialog = cfd; cfdata->es->config_dialog = cfd;
} }
else
e_gadcon_populate(cfdata->es->gadcon);
if (cfdata->escfg->desk_show_mode) if (cfdata->escfg->desk_show_mode)
{ {