From: Enlightenment S. <no-...@en...> - 2011-08-31 00:05:51
|
Log: dont stopr and del previous page data - wziard does it for us really :) Author: raster Date: 2011-08-30 17:05:44 -0700 (Tue, 30 Aug 2011) New Revision: 63014 Trac: http://trac.enlightenment.org/e/changeset/63014 Modified: trunk/e/src/modules/wizard/page_010.c trunk/e/src/modules/wizard/page_020.c trunk/e/src/modules/wizard/page_050.c trunk/e/src/modules/wizard/page_060.c trunk/e/src/modules/wizard/page_110.c trunk/e/src/modules/wizard/page_150.c Modified: trunk/e/src/modules/wizard/page_010.c =================================================================== --- trunk/e/src/modules/wizard/page_010.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_010.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -171,14 +171,14 @@ evas_object_show(ob); evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } EAPI int 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 */ eina_stringshare_del(e_config->language); e_config->language = eina_stringshare_ref(lang); Modified: trunk/e/src/modules/wizard/page_020.c =================================================================== --- trunk/e/src/modules/wizard/page_020.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_020.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -130,7 +130,7 @@ evas_object_show(ob); evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; e_wizard_button_next_enable_set(0); return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } @@ -138,7 +138,7 @@ EAPI int wizard_page_hide(E_Wizard_Page *pg) { - evas_object_del(pg->data); +// evas_object_del(pg->data); // actually apply profile if (!profile) profile = "standard"; e_config_profile_set(profile); Modified: trunk/e/src/modules/wizard/page_050.c =================================================================== --- trunk/e/src/modules/wizard/page_050.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_050.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -166,7 +166,7 @@ evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } @@ -174,7 +174,7 @@ wizard_page_hide(E_Wizard_Page *pg) { 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_custom = 1; Modified: trunk/e/src/modules/wizard/page_060.c =================================================================== --- trunk/e/src/modules/wizard/page_060.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_060.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -42,7 +42,7 @@ evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } @@ -69,7 +69,7 @@ e_config->focus_last_focused_per_desktop = 1; e_config->pointer_slide = 1; } - evas_object_del(pg->data); +// evas_object_del(pg->data); return 1; } Modified: trunk/e/src/modules/wizard/page_110.c =================================================================== --- trunk/e/src/modules/wizard/page_110.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_110.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -29,7 +29,7 @@ evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; e_wizard_button_next_enable_set(1); } @@ -152,7 +152,7 @@ ecore_timer_del(connman_timeout); connman_timeout = NULL; } - if (pg->data) evas_object_del(pg->data); +// if (pg->data) evas_object_del(pg->data); return 1; } Modified: trunk/e/src/modules/wizard/page_150.c =================================================================== --- trunk/e/src/modules/wizard/page_150.c 2011-08-30 23:03:07 UTC (rev 63013) +++ trunk/e/src/modules/wizard/page_150.c 2011-08-31 00:05:44 UTC (rev 63014) @@ -129,7 +129,7 @@ evas_object_show(of); e_wizard_page_show(o); - pg->data = of; +// pg->data = o; return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } @@ -200,7 +200,7 @@ E_CONFIG_DD_FREE(conf_edd); } e_config_save_queue(); - if (pg->data) evas_object_del(pg->data); +// if (pg->data) evas_object_del(pg->data); return 1; } |