Free config list.

Use switch to check gadman change.


SVN revision: 13397
This commit is contained in:
sebastid 2005-02-16 11:38:14 +00:00 committed by sebastid
parent 9718ef9fa7
commit fd3d7d588d
2 changed files with 38 additions and 22 deletions

View File

@ -228,6 +228,7 @@ _battery_shutdown(Battery *e)
ecore_timer_del(e->battery_check_timer);
evas_list_free(e->conf->faces);
free(e->conf);
free(e);
}
@ -586,18 +587,25 @@ _battery_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change ch
Evas_Coord x, y, w, h;
ef = data;
if (change == E_GADMAN_CHANGE_MOVE_RESIZE)
switch (change)
{
e_gadman_client_geometry_get(ef->gmc, &x, &y, &w, &h);
evas_object_move(ef->bat_object, x, y);
evas_object_move(ef->event_object, x, y);
evas_object_resize(ef->bat_object, w, h);
evas_object_resize(ef->event_object, w, h);
}
else if (change == E_GADMAN_CHANGE_RAISE)
{
evas_object_raise(ef->bat_object);
evas_object_raise(ef->event_object);
case E_GADMAN_CHANGE_MOVE_RESIZE:
e_gadman_client_geometry_get(ef->gmc, &x, &y, &w, &h);
evas_object_move(ef->bat_object, x, y);
evas_object_move(ef->event_object, x, y);
evas_object_resize(ef->bat_object, w, h);
evas_object_resize(ef->event_object, w, h);
break;
case E_GADMAN_CHANGE_RAISE:
evas_object_raise(ef->bat_object);
evas_object_raise(ef->event_object);
break;
case E_GADMAN_CHANGE_EDGE:
case E_GADMAN_CHANGE_ZONE:
/* FIXME
* Must we do something here?
*/
break;
}
}

View File

@ -193,6 +193,7 @@ _clock_shutdown(Clock *clock)
e_object_del(E_OBJECT(clock->config_menu));
evas_list_free(clock->conf->faces);
free(clock->conf);
free(clock);
}
@ -316,18 +317,25 @@ _clock_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change chan
Evas_Coord x, y, w, h;
face = data;
if (change == E_GADMAN_CHANGE_MOVE_RESIZE)
switch (change)
{
e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h);
evas_object_move(face->clock_object, x, y);
evas_object_move(face->event_object, x, y);
evas_object_resize(face->clock_object, w, h);
evas_object_resize(face->event_object, w, h);
}
else if (change == E_GADMAN_CHANGE_RAISE)
{
evas_object_raise(face->clock_object);
evas_object_raise(face->event_object);
case E_GADMAN_CHANGE_MOVE_RESIZE:
e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h);
evas_object_move(face->clock_object, x, y);
evas_object_move(face->event_object, x, y);
evas_object_resize(face->clock_object, w, h);
evas_object_resize(face->event_object, w, h);
break;
case E_GADMAN_CHANGE_RAISE:
evas_object_raise(face->clock_object);
evas_object_raise(face->event_object);
break;
case E_GADMAN_CHANGE_EDGE:
case E_GADMAN_CHANGE_ZONE:
/* FIXME
* Must we do something here?
*/
break;
}
}