vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dont stopr and del previous page data - wziard does it for us really :) 

SVN revision: 63014
This commit is contained in:
Carsten Haitzler 2011-08-31 00:05:44 +00:00
parent f3a9da35f3
commit 3119ce015c
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/wizard/page_010.c
View File

@ -171,14 +171,14 @@ wizard_page_show(E_Wizard_Page *pg)
evas_object_show(ob); evas_object_show(ob);
evas_object_show(of); evas_object_show(of);
e_wizard_page_show(o); e_wizard_page_show(o);
pg->data = of; // pg->data = o;
return 1; /* 1 == show ui, and wait for user, 0 == just continue */ return 1; /* 1 == show ui, and wait for user, 0 == just continue */
} }
EAPI int EAPI int
wizard_page_hide(E_Wizard_Page *pg) wizard_page_hide(E_Wizard_Page *pg)
{ {
evas_object_del(pg->data); // evas_object_del(pg->data);
/* special - language inits its stuff the moment it goes away */ /* special - language inits its stuff the moment it goes away */
eina_stringshare_del(e_config->language); eina_stringshare_del(e_config->language);
e_config->language = eina_stringshare_ref(lang); e_config->language = eina_stringshare_ref(lang);

4
src/modules/wizard/page_020.c
View File

@ -130,7 +130,7 @@ wizard_page_show(E_Wizard_Page *pg)
evas_object_show(ob); evas_object_show(ob);
evas_object_show(of); evas_object_show(of);
e_wizard_page_show(o); e_wizard_page_show(o);
pg->data = of; // pg->data = o;
e_wizard_button_next_enable_set(0); e_wizard_button_next_enable_set(0);
return 1; /* 1 == show ui, and wait for user, 0 == just continue */ return 1; /* 1 == show ui, and wait for user, 0 == just continue */
} }
@ -138,7 +138,7 @@ wizard_page_show(E_Wizard_Page *pg)
EAPI int EAPI int
wizard_page_hide(E_Wizard_Page *pg) wizard_page_hide(E_Wizard_Page *pg)
{ {
evas_object_del(pg->data); // evas_object_del(pg->data);
// actually apply profile // actually apply profile
if (!profile) profile = "standard"; if (!profile) profile = "standard";
e_config_profile_set(profile); e_config_profile_set(profile);

4
src/modules/wizard/page_050.c
View File

@ -166,7 +166,7 @@ wizard_page_show(E_Wizard_Page *pg)
evas_object_show(of); evas_object_show(of);
e_wizard_page_show(o); e_wizard_page_show(o);
pg->data = of; // pg->data = o;
return 1; /* 1 == show ui, and wait for user, 0 == just continue */ return 1; /* 1 == show ui, and wait for user, 0 == just continue */
} }
@ -174,7 +174,7 @@ EAPI int
wizard_page_hide(E_Wizard_Page *pg) wizard_page_hide(E_Wizard_Page *pg)
{ {
obs = eina_list_free(obs); obs = eina_list_free(obs);
evas_object_del(pg->data); // evas_object_del(pg->data);
e_config->scale.use_dpi = 0; e_config->scale.use_dpi = 0;
e_config->scale.use_custom = 1; e_config->scale.use_custom = 1;

4
src/modules/wizard/page_060.c
View File

@ -42,7 +42,7 @@ wizard_page_show(E_Wizard_Page *pg)
evas_object_show(of); evas_object_show(of);
e_wizard_page_show(o); e_wizard_page_show(o);
pg->data = of; // pg->data = o;
return 1; /* 1 == show ui, and wait for user, 0 == just continue */ return 1; /* 1 == show ui, and wait for user, 0 == just continue */
} }
@ -69,7 +69,7 @@ wizard_page_hide(E_Wizard_Page *pg)
e_config->focus_last_focused_per_desktop = 1; e_config->focus_last_focused_per_desktop = 1;
e_config->pointer_slide = 1; e_config->pointer_slide = 1;
} }
evas_object_del(pg->data); // evas_object_del(pg->data);
return 1; return 1;
} }

4
src/modules/wizard/page_110.c
View File

@ -29,7 +29,7 @@ _recommend_connman(E_Wizard_Page *pg)
evas_object_show(of); evas_object_show(of);
e_wizard_page_show(o); e_wizard_page_show(o);
pg->data = of; // pg->data = o;
e_wizard_button_next_enable_set(1); e_wizard_button_next_enable_set(1);
} }
@ -152,7 +152,7 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
ecore_timer_del(connman_timeout); ecore_timer_del(connman_timeout);
connman_timeout = NULL; connman_timeout = NULL;
} }
if (pg->data) evas_object_del(pg->data); // if (pg->data) evas_object_del(pg->data);
return 1; return 1;
} }

4
src/modules/wizard/page_150.c
View File

@ -129,7 +129,7 @@ wizard_page_show(E_Wizard_Page *pg)
evas_object_show(of); evas_object_show(of);
e_wizard_page_show(o); e_wizard_page_show(o);
pg->data = of; // pg->data = o;
return 1; /* 1 == show ui, and wait for user, 0 == just continue */ return 1; /* 1 == show ui, and wait for user, 0 == just continue */
} }
@ -200,7 +200,7 @@ wizard_page_hide(E_Wizard_Page *pg)
E_CONFIG_DD_FREE(conf_edd); E_CONFIG_DD_FREE(conf_edd);
} }
e_config_save_queue(); e_config_save_queue();
if (pg->data) evas_object_del(pg->data); // if (pg->data) evas_object_del(pg->data);
return 1; return 1;
} }