From 3119ce015cd81a371d345289f62f6a592e0469b0 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 31 Aug 2011 00:05:44 +0000 Subject: [PATCH] dont stopr and del previous page data - wziard does it for us really :) SVN revision: 63014 --- src/modules/wizard/page_010.c | 4 ++-- src/modules/wizard/page_020.c | 4 ++-- src/modules/wizard/page_050.c | 4 ++-- src/modules/wizard/page_060.c | 4 ++-- src/modules/wizard/page_110.c | 4 ++-- src/modules/wizard/page_150.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c index 0dc53b2..890e660 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c @@ -171,14 +171,14 @@ wizard_page_show(E_Wizard_Page *pg) 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); diff --git a/src/modules/wizard/page_020.c b/src/modules/wizard/page_020.c index c69cfeb..9ce5fb5 100644 --- a/src/modules/wizard/page_020.c +++ b/src/modules/wizard/page_020.c @@ -130,7 +130,7 @@ wizard_page_show(E_Wizard_Page *pg) 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 @@ wizard_page_show(E_Wizard_Page *pg) 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); diff --git a/src/modules/wizard/page_050.c b/src/modules/wizard/page_050.c index a334e4e..186d424 100644 --- a/src/modules/wizard/page_050.c +++ b/src/modules/wizard/page_050.c @@ -166,7 +166,7 @@ wizard_page_show(E_Wizard_Page *pg) 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 @@ EAPI int 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; diff --git a/src/modules/wizard/page_060.c b/src/modules/wizard/page_060.c index 98b0de0..7c044f4 100644 --- a/src/modules/wizard/page_060.c +++ b/src/modules/wizard/page_060.c @@ -42,7 +42,7 @@ wizard_page_show(E_Wizard_Page *pg) 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 @@ wizard_page_hide(E_Wizard_Page *pg) 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; } diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c index bc7ccd5..d2c1b1a 100644 --- a/src/modules/wizard/page_110.c +++ b/src/modules/wizard/page_110.c @@ -29,7 +29,7 @@ _recommend_connman(E_Wizard_Page *pg) 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 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__) 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; } diff --git a/src/modules/wizard/page_150.c b/src/modules/wizard/page_150.c index 5658aab..793f03e 100644 --- a/src/modules/wizard/page_150.c +++ b/src/modules/wizard/page_150.c @@ -129,7 +129,7 @@ wizard_page_show(E_Wizard_Page *pg) 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 @@ wizard_page_hide(E_Wizard_Page *pg) 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; } -- 2.7.4