fix shelf autohide after changing its settings in advanced mode.

shelf should be hidden if it was recreated (restart == 1) and autohide
is set.

SVN revision: 40127

diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c
index 42e62c9b20a9244ca7216752ac0171cbd9b46544..af36eef3e5316da54843a1793302bdc5522f639c 100644 (file)
--- a/src/bin/e_int_shelf_config.c
+++ b/src/bin/e_int_shelf_config.c
@@ -402,10 +402,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    cfdata->escfg->autohide_show_action = cfdata->autohiding_show_action;
    cfdata->escfg->hide_timeout = cfdata->hide_timeout;
    cfdata->escfg->hide_duration = cfdata->hide_duration;
-   if (cfdata->escfg->autohide && !cfdata->es->hidden)
-     e_shelf_toggle(cfdata->es, 0);
-   else if (!cfdata->escfg->autohide && cfdata->es->hidden)
-     e_shelf_toggle(cfdata->es, 1);
    
    cfdata->escfg->desk_show_mode = cfdata->desk_show_mode;
    cfdata->escfg->desk_list = NULL;
@@ -476,6 +472,11 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    else
      e_shelf_show(cfdata->es);
 
+   if (cfdata->escfg->autohide && !cfdata->es->hidden)
+     e_shelf_toggle(cfdata->es, 0);
+   else if (!cfdata->escfg->autohide && cfdata->es->hidden)
+     e_shelf_toggle(cfdata->es, 1);
+
    e_config_save_queue();   
    cfdata->es->config_dialog = cfd;
    return 1; /* Apply was OK */