ecrustified

SVN revision: 69034
This commit is contained in:
Mike Blumenkrantz 2012-03-07 22:50:53 +00:00
parent 3428e5e07a
commit 2bdd24ea93
1 changed files with 344 additions and 343 deletions

View File

@ -64,9 +64,9 @@ e_desk_new(E_Zone *zone, int x, int y)
EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
{
if ((cfname->container >= 0) &&
((int) zone->container->num != cfname->container)) continue;
((int)zone->container->num != cfname->container)) continue;
if ((cfname->zone >= 0) &&
((int) zone->num != cfname->zone)) continue;
((int)zone->num != cfname->zone)) continue;
if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y))
continue;
desk->name = eina_stringshare_add(cfname->name);
@ -165,9 +165,9 @@ e_desk_name_update(void)
EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
{
if ((cfname->container >= 0) &&
((int) con->num != cfname->container)) continue;
((int)con->num != cfname->container)) continue;
if ((cfname->zone >= 0) &&
((int) zone->num != cfname->zone)) continue;
((int)zone->num != cfname->zone)) continue;
if ((cfname->desk_x != d_x) ||
(cfname->desk_y != d_y)) continue;
e_desk_name_set(desk, cfname->name);
@ -240,10 +240,10 @@ e_desk_show(E_Desk *desk)
msg = alloca(sizeof(Edje_Message_Float_Set) + (4 * sizeof(double)));
msg->count = 5;
msg->val[0] = e_config->desk_flip_animate_time;
msg->val[1] = (double) desk->x;
msg->val[2] = (double) desk->zone->desk_x_count;
msg->val[3] = (double) desk->y;
msg->val[4] = (double) desk->zone->desk_y_count;
msg->val[1] = (double)desk->x;
msg->val[2] = (double)desk->zone->desk_x_count;
msg->val[3] = (double)desk->y;
msg->val[4] = (double)desk->zone->desk_y_count;
edje_object_message_send(desk->zone->bg_object, EDJE_MESSAGE_FLOAT_SET, 0, msg);
if (desk->zone->bg_object) was_zone = 1;
@ -289,7 +289,7 @@ e_desk_show(E_Desk *desk)
E_Config_Shelf *cf_es;
E_Zone *zone;
E_Config_Shelf_Desk *sd;
int show_shelf=0;
int show_shelf = 0;
if (!es) continue;
if (!es->cfg->desk_show_mode) continue;
@ -297,7 +297,7 @@ e_desk_show(E_Desk *desk)
if (!cf_es) continue;
zone = e_util_zone_current_get(e_manager_current_get());
if (cf_es->zone != (int) zone->num) continue;
if (cf_es->zone != (int)zone->num) continue;
EINA_LIST_FOREACH(es->cfg->desk_list, ll, sd)
{
@ -905,3 +905,4 @@ _e_desk_hide_animator(void *data)
return ECORE_CALLBACK_RENEW;
}