fix zone num for wallpaper too

SVN revision: 32205
This commit is contained in:
Carsten Haitzler 2007-10-29 17:40:12 +00:00
parent bfe82f6c28
commit 96b56f9854
1 changed files with 6 additions and 6 deletions

View File

@ -417,7 +417,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
z = e_zone_current_get(c); z = e_zone_current_get(c);
d = e_desk_current_get(z); d = e_desk_current_get(z);
cfbg = e_bg_config_get(c->num, z->num, d->x, d->y); cfbg = e_bg_config_get(c->num, z->id, d->x, d->y);
/* if we have a config for this bg, use it. */ /* if we have a config for this bg, use it. */
if (cfbg) if (cfbg)
{ {
@ -796,11 +796,11 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
} }
else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_DESK) else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_DESK)
{ {
e_bg_del(z->container->num, z->num, d->x, d->y); e_bg_del(z->container->num, z->id, d->x, d->y);
e_bg_del(z->container->num, -1, d->x, d->y); e_bg_del(z->container->num, -1, d->x, d->y);
e_bg_del(-1, z->num, d->x, d->y); e_bg_del(-1, z->id, d->x, d->y);
e_bg_del(-1, -1, d->x, d->y); e_bg_del(-1, -1, d->x, d->y);
e_bg_add(z->container->num, z->num, d->x, d->y, cfdata->bg); e_bg_add(z->container->num, z->id, d->x, d->y, cfdata->bg);
} }
else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_SCREEN) else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_SCREEN)
@ -812,7 +812,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
cfbg = l->data; cfbg = l->data;
if ( if (
(cfbg->container == z->container->num) && (cfbg->container == z->container->num) &&
(cfbg->zone == z->num) (cfbg->zone == z->id)
) )
fl = evas_list_append(fl, cfbg); fl = evas_list_append(fl, cfbg);
} }
@ -823,7 +823,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y); e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
fl = evas_list_remove_list(fl, fl); fl = evas_list_remove_list(fl, fl);
} }
e_bg_add(z->container->num, z->num, -1, -1, cfdata->bg); e_bg_add(z->container->num, z->id, -1, -1, cfdata->bg);
} }
} }
e_bg_update(); e_bg_update();