Fix a bunch of mistakes I made before.

This commit is contained in:
Jaime Thomas
2009-02-17 22:48:11 +00:00
parent 2fb05a62d4
commit 6a4420575a
11 changed files with 183 additions and 175 deletions

View File

@@ -79,9 +79,9 @@ _button_cb_begin(void *data, Evas_Object *o __UNUSED__,
return;
}
proj->quick = ecdb_check_checked_get(proj->speed);
proj->quick = ecdb_check_checked_get(proj->speed);
// TODO: Error Messages here
if (!ecdb_erase_disc(proj))
if (!ecdb_erase_disc(proj, page))
{
printf("Disc not erasable!\n");
snprintf(buf, sizeof(buf), "Disc not erasable!");
@@ -176,34 +176,34 @@ ecdb_erase_page_show(Ecdb_Page *page)
void
ecdb_erase_cleanup(Ecdb_Page *page)
{
Ecdb_Erase_Project *proj;
int idx;
if (!page)
{
printf("ecdb_erase_cleanup: NULL page!\n");
return;
}
proj = evas_object_data_get(proj->erase, "proj");
if (!proj)
{
printf("ecdb_erase_cleanup: NULL proj!\n");
return;
}
Evas_Object *objs[] = {proj->speed, ECDB_PROJECT(proj)->ret,
ECDB_PROJECT(proj)->begin,
ECDB_PROJECT(proj)->drive_combo, NULL};
for (idx = 0; objs[idx] != NULL; idx++)
{
Ecdb_Erase_Project *proj;
int idx;
if (!page)
{
printf("ecdb_erase_cleanup: NULL page!\n");
return;
}
proj = evas_object_data_get(page->erase, "proj");
if (!proj)
{
printf("ecdb_erase_cleanup: NULL proj!\n");
return;
}
Evas_Object *objs[] = {proj->speed, ECDB_PROJECT(proj)->ret,
ECDB_PROJECT(proj)->begin,
ECDB_PROJECT(proj)->drive_combo, NULL};
for (idx = 0; objs[idx] != NULL; idx++)
edje_object_signal_emit(objs[idx], "ecdb,disable", "ecdb");
edje_object_part_text_set(page->erase, "progress_text", "Erase Complete!");
edje_object_signal_emit(page->erase, "ecdb,erase,done", "ecdb");
edje_object_signal_emit(page->erase, "ecdb,erase,done", "ecdb");
// Set attributes back to normal
ecdb_check_checked_set(proj->speed, 0);
ecdb_check_checked_set(proj->speed, 0);
proj->speed = 0;
}