e/wizard: improve waiting for cache build

SVN revision: 79708

diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index ab359c99832d990d57357e7878c1d9916fda0097..e8b80e35fcce9e160879df6cb6d7084c3dd12afd 100644 (file)
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -1,12 +1,16 @@
 #include "e.h"
 #include "e_mod_main.h"
 
-static void     _e_wizard_next_eval(void);
+static int      _e_wizard_next_eval(void);
 static E_Popup *_e_wizard_main_new(E_Zone *zone);
 static E_Popup *_e_wizard_extra_new(E_Zone *zone);
 static void     _e_wizard_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event);
 static void     _e_wizard_cb_next(void *data, Evas_Object *obj, const char *emission, const char *source);
 
+static Eina_Bool _e_wizard_cb_next_page(void *data);
+static Eina_Bool _e_wizard_cb_desktops_update(void *data, int ev_type, void *ev);
+static Eina_Bool _e_wizard_cb_icons_update(void *data, int ev_type, void *ev);
+
 static E_Popup *pop = NULL;
 static Eina_List *pops = NULL;
 static Evas_Object *o_bg = NULL;
@@ -14,8 +18,17 @@ static Evas_Object *o_content = NULL;
 static Eina_List *pages = NULL;
 static E_Wizard_Page *curpage = NULL;
 static int next_ok = 1;
-static int next_can = 0;
 static int next_prev = 0;
+static Eina_Bool no_show = EINA_FALSE;
+static Eina_Bool next_can = EINA_FALSE;
+
+static Eina_List *handlers = NULL;
+static Eina_Bool got_desktops = EINA_FALSE;
+static Eina_Bool got_icons = EINA_FALSE;
+static Eina_Bool next_need_xdg_desktops = EINA_FALSE;
+static Eina_Bool next_need_xdg_icons = EINA_FALSE;
+
+static Ecore_Timer *next_timer = NULL;
 
 EAPI int
 e_wizard_init(void)
@@ -42,6 +55,12 @@ e_wizard_init(void)
                }
           }
      }
+
+   E_LIST_HANDLER_APPEND(handlers, EFREET_EVENT_DESKTOP_CACHE_BUILD,
+                         _e_wizard_cb_desktops_update, NULL);
+
+   E_LIST_HANDLER_APPEND(handlers, EFREET_EVENT_ICON_CACHE_UPDATE,
+                         _e_wizard_cb_icons_update, NULL);
    return 1;
 }
 
@@ -61,6 +80,10 @@ e_wizard_shutdown(void)
      e_object_del(eo);
    EINA_LIST_FREE(pages, pg)
      e_wizard_page_del(pg);
+
+   if (next_timer) ecore_timer_del(next_timer);
+   next_timer = NULL;
+   E_FREE_LIST(handlers, ecore_event_handler_del);
    return 1;
 }
 
@@ -72,16 +95,18 @@ e_wizard_go(void)
         if (pages)
           {
              curpage = pages->data;
-             if (pages->next) next_can = 1;
           }
      }
    if (curpage)
      {
-        if ((!curpage->data) && (curpage->init)) curpage->init(curpage);
-        _e_wizard_next_eval();
+        int next;
+
+        if (curpage->init) curpage->init(curpage, &next_need_xdg_desktops, &next_need_xdg_icons);
+        next = _e_wizard_next_eval();
         if ((curpage->show) && (!curpage->show(curpage)))
           {
-             e_wizard_next();
+             if (next)
+               e_wizard_next();
           }
      }
 }
@@ -112,21 +137,28 @@ e_wizard_next(void)
           {
              if (eina_list_next(l))
                {
+                  int next;
                   if (curpage)
                     {
                        if (curpage->hide)
                          curpage->hide(curpage);
                     }
                   curpage = eina_list_data_get(eina_list_next(l));
-                  if (!curpage->data)
+                  next_need_xdg_desktops = EINA_FALSE;
+                  next_need_xdg_icons = EINA_FALSE;
+                  if (curpage->init)
+                    curpage->init(curpage, &next_need_xdg_desktops, &next_need_xdg_icons);
+                  no_show = EINA_FALSE;
+                  next = _e_wizard_next_eval();
+                  if ((curpage->show) && (curpage->show(curpage)))
                     {
-                       if (curpage->init)
-                         curpage->init(curpage);
+                       break;
                     }
-                  next_can = 1;
-                  _e_wizard_next_eval();
-                  if ((curpage->show) && (curpage->show(curpage)))
+                  if (!next)
                     {
+                       no_show = EINA_TRUE;
+                       /* Advance within 15 secs if no other trigger */
+                       next_timer = ecore_timer_add(15.0, _e_wizard_cb_next_page, NULL);
                        break;
                     }
                }
@@ -161,7 +193,7 @@ e_wizard_page_show(Evas_Object *obj)
 
 EAPI E_Wizard_Page *
 e_wizard_page_add(void *handle,
-                  int (*init_cb)(E_Wizard_Page *pg),
+                  int (*init_cb)(E_Wizard_Page *pg, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons),
                   int (*shutdown_cb)(E_Wizard_Page *pg),
                   int (*show_cb)(E_Wizard_Page *pg),
                   int (*hide_cb)(E_Wizard_Page *pg),
@@ -223,27 +255,51 @@ e_wizard_dir_get(void)
    return e_module_dir_get(wiz_module);
 }
 
-static void
+EAPI void
+e_wizard_xdg_desktops_reset(void)
+{
+   got_desktops = EINA_FALSE;
+}
+
+static int
 _e_wizard_next_eval(void)
 {
    int ok;
 
-   ok = next_can;
+   if (next_timer) ecore_timer_del(next_timer);
+   next_timer = NULL;
+
+   ok = 1;
+   if (((next_need_xdg_desktops) && (!got_desktops)) ||
+       ((next_need_xdg_icons) && (!got_icons)))
+     ok = 0;
    if (!next_ok) ok = 0;
    if (next_prev != ok)
      {
         if (ok)
-        {
-            edje_object_part_text_set(o_bg, "e.text.label", _("Next"));
-            edje_object_signal_emit(o_bg, "e,state,next,enable", "e");
-        }
+          {
+             if (no_show)
+               {
+                  /* If we are waiting on a hidden page, continue */
+                  e_wizard_next();
+                  no_show = EINA_FALSE;
+                  ok = -1;
+               }
+             else
+               {
+                  edje_object_part_text_set(o_bg, "e.text.label", _("Next"));
+                  edje_object_signal_emit(o_bg, "e,state,next,enable", "e");
+               }
+          }
         else
-        {
-            edje_object_part_text_set(o_bg, "e.text.label", _("Please Wait..."));
-            edje_object_signal_emit(o_bg, "e,state,next,disable", "e");
-        }
+          {
+             edje_object_part_text_set(o_bg, "e.text.label", _("Please Wait..."));
+             edje_object_signal_emit(o_bg, "e,state,next,disable", "e");
+          }
         next_prev = ok;
      }
+   next_can = ok;
+   return ok;
 }
 
 static E_Popup *
@@ -348,6 +404,34 @@ _e_wizard_cb_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *ob
 static void
 _e_wizard_cb_next(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
-   e_wizard_next();
+   /* TODO: Disable button in theme */
+   if (next_can)
+     e_wizard_next();
+}
+
+static Eina_Bool
+_e_wizard_cb_next_page(void *data __UNUSED__)
+{
+   next_timer = NULL;
+   next_need_xdg_desktops = EINA_FALSE;
+   next_need_xdg_icons = EINA_FALSE;
+   _e_wizard_next_eval();
+   return ECORE_CALLBACK_CANCEL;
 }
 
+
+static Eina_Bool
+_e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
+{
+   got_desktops = EINA_TRUE;
+   _e_wizard_next_eval();
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_e_wizard_cb_icons_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
+{
+   got_icons = EINA_TRUE;
+   _e_wizard_next_eval();
+   return ECORE_CALLBACK_PASS_ON;
+}

diff --git a/src/modules/wizard/e_wizard.h b/src/modules/wizard/e_wizard.h
index f10039b98f54f107627211057d57002e05aba1e3..19391e9f87bda2e1aa2f6116131b61e4a37588f6 100644 (file)
--- a/src/modules/wizard/e_wizard.h
+++ b/src/modules/wizard/e_wizard.h
@@ -10,12 +10,11 @@ struct _E_Wizard_Page
 {
    void *handle;
    Evas *evas;
-   int (*init)     (E_Wizard_Page *pg);
+   int (*init)     (E_Wizard_Page *pg, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons);
    int (*shutdown) (E_Wizard_Page *pg);
    int (*show)     (E_Wizard_Page *pg);
    int (*hide)     (E_Wizard_Page *pg);
    int (*apply)    (E_Wizard_Page *pg);
-   void *data;
 };
 
 EAPI int e_wizard_init(void);
@@ -25,7 +24,7 @@ EAPI void e_wizard_apply(void);
 EAPI void e_wizard_next(void);
 EAPI void e_wizard_page_show(Evas_Object *obj);
 EAPI E_Wizard_Page *e_wizard_page_add(void *handle,
-                                      int (*init)     (E_Wizard_Page *pg),
+                                      int (*init)     (E_Wizard_Page *pg, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons),
                                       int (*shutdown) (E_Wizard_Page *pg),
                                       int (*show)     (E_Wizard_Page *pg),
                                       int (*hide)     (E_Wizard_Page *pg),
@@ -36,6 +35,7 @@ EAPI void e_wizard_button_next_enable_set(int enable);
 EAPI void e_wizard_title_set(const char *title);
 EAPI void e_wizard_labels_update(void);
 EAPI const char *e_wizard_dir_get(void);
+EAPI void e_wizard_xdg_desktops_reset(void);
 
 #endif
 #endif

diff --git a/src/modules/wizard/page_000.c b/src/modules/wizard/page_000.c
index bb88c268a5d0485a145b16cfa5e0b29a2ea94fd3..bf6badf1d53b435c977e0a44cd3f874a88c1ca81 100644 (file)
--- a/src/modules/wizard/page_000.c
+++ b/src/modules/wizard/page_000.c
@@ -3,11 +3,10 @@
 #include "e.h"
 #include "e_mod_main.h"
 
-static Ecore_Event_Handler *_update_handler = NULL;
 static Ecore_Timer *_next_timer = NULL;
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }
@@ -15,8 +14,6 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
 EAPI int
 wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 {
-   if (_update_handler) ecore_event_handler_del(_update_handler);
-   _update_handler = NULL;
    if (_next_timer) ecore_timer_del(_next_timer);
    _next_timer = NULL;
    return 1;
@@ -26,23 +23,11 @@ static Eina_Bool
 _next_page(void *data __UNUSED__)
 {
    _next_timer = NULL;
-   if (_update_handler) ecore_event_handler_del(_update_handler);
-   _update_handler = NULL;
    e_wizard_button_next_enable_set(1);
    e_wizard_next();
    return ECORE_CALLBACK_CANCEL;
 }
 
-static Eina_Bool
-_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
-{
-  if (_update_handler) ecore_event_handler_del(_update_handler);
-   _update_handler = NULL;
-   if (_next_timer) ecore_timer_del(_next_timer);
-   _next_timer = ecore_timer_add(2.0, _next_page, NULL);
-   return ECORE_CALLBACK_PASS_ON;
-}
-
 EAPI int
 wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 {
@@ -54,12 +39,8 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
    e_theme_edje_object_set(o, "base/theme/wizard", "e/wizard/firstpage");
    e_wizard_page_show(o);
 
-   _update_handler =
-     ecore_event_handler_add(EFREET_EVENT_DESKTOP_CACHE_BUILD,
-                             _cb_desktops_update, NULL);
-
-   /* advance in 15 sec anyway if no efreet update comes */
-   _next_timer = ecore_timer_add(15.0, _next_page, NULL);
+   /* advance in 1 sec */
+   _next_timer = ecore_timer_add(1.0, _next_page, NULL);
    return 1;
 }
 

diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c
index ba67c4be9d6887f24f269d24a6878f3adb2e118d..e8ce1aabf61c04eac0f56e87ca46e84ae7de62f0 100644 (file)
--- a/src/modules/wizard/page_010.c
+++ b/src/modules/wizard/page_010.c
@@ -82,7 +82,7 @@ _basic_lang_list_sort(const void *data1, const void *data2)
 }
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    FILE *output;
 
@@ -210,7 +210,10 @@ wizard_page_hide(E_Wizard_Page *pg __UNUSED__)
 /* special - language inits its stuff the moment it goes away */
    eina_stringshare_del(e_config->language);
    e_config->language = eina_stringshare_ref(lang);
-   /* TODO: This can trigger a efreet cache rebuild, need to wait until it is done */
+   /* TODO:
+    * This should be on lang select,
+    * so if next page needs xdg we can't press next */
+   e_wizard_xdg_desktops_reset();
    e_intl_language_set(e_config->language);
    e_wizard_labels_update();
    return 1;

diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c
index cd2effb73f559dd537fefcea5a446a4665493553..4aee3e7b760c6467d593e60be83accbdbf9732b6 100644 (file)
--- a/src/modules/wizard/page_011.c
+++ b/src/modules/wizard/page_011.c
@@ -110,7 +110,7 @@ implement_layout(void)
 }
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    // parse kbd rules here
    find_rules();

diff --git a/src/modules/wizard/page_020.c b/src/modules/wizard/page_020.c
index 42ee5eb4d373aec47065f080fa109027d013c492..19071a095eedad6193de8b271a282d7371de4cdf 100644 (file)
--- a/src/modules/wizard/page_020.c
+++ b/src/modules/wizard/page_020.c
@@ -29,7 +29,7 @@ _profile_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 }
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c
index e09b7dc672437ad01f83c1f67e68f47474e9e6e1..3a1b471570858c8707199178d43912fa1eca7799 100644 (file)
--- a/src/modules/wizard/page_030.c
+++ b/src/modules/wizard/page_030.c
@@ -3,7 +3,7 @@
 #include "e_mod_main.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_040.c b/src/modules/wizard/page_040.c
index cfbb72567f08f688ef53cb904b0b8c99a7b46a8a..dce31602e9f58bca5ade5fb68abcbb7edb60fd06 100644 (file)
--- a/src/modules/wizard/page_040.c
+++ b/src/modules/wizard/page_040.c
@@ -2,20 +2,18 @@
 #include "e.h"
 #include "e_mod_main.h"
 
-static Ecore_Event_Handler *_update_handler = NULL;
 static Ecore_Timer *_next_timer = NULL;
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons __UNUSED__)
 {
+   *need_xdg_desktops = EINA_TRUE;
    return 1;
 }
 
 EAPI int
 wizard_page_shutdown(E_Wizard_Page *pg __UNUSED__)
 {
-   if (_update_handler) ecore_event_handler_del(_update_handler);
-   _update_handler = NULL;
    if (_next_timer) ecore_timer_del(_next_timer);
    _next_timer = NULL;
    return 1;
@@ -25,23 +23,11 @@ static Eina_Bool
 _next_page(void *data __UNUSED__)
 {
    _next_timer = NULL;
-   if (_update_handler) ecore_event_handler_del(_update_handler);
-   _update_handler = NULL;
    e_wizard_button_next_enable_set(1);
    e_wizard_next();
    return ECORE_CALLBACK_CANCEL;
 }
 
-static Eina_Bool
-_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
-{
-   if (_update_handler) ecore_event_handler_del(_update_handler);
-   _update_handler = NULL;
-   if (_next_timer) ecore_timer_del(_next_timer);
-   _next_timer = ecore_timer_add(0.1, _next_page, NULL);
-   return ECORE_CALLBACK_PASS_ON;
-}
-
 EAPI int
 wizard_page_show(E_Wizard_Page *pg __UNUSED__)
 {
@@ -57,13 +43,8 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
    snprintf(buf, sizeof(buf), "%s/extra_desktops", e_wizard_dir_get());
    extra_desks = ecore_file_ls(buf);
 
-   _update_handler =
-     ecore_event_handler_add(EFREET_EVENT_DESKTOP_CACHE_UPDATE,
-                             _cb_desktops_update, NULL);
-   
-   /* advance in 15 sec anyway if no efreet update comes */
-   _next_timer = ecore_timer_add(15.0, _next_page, NULL);
-   if (!extra_desks) return 1;
+   /* advance in 1 sec */
+   _next_timer = ecore_timer_add(1.0, _next_page, NULL);
    
    EINA_LIST_FREE(extra_desks, file)
      {
@@ -127,8 +108,6 @@ wizard_page_show(E_Wizard_Page *pg __UNUSED__)
      {
         if (_next_timer) ecore_timer_del(_next_timer);
         _next_timer = NULL;
-        if (_update_handler) ecore_event_handler_del(_update_handler);
-        _update_handler = NULL;
         return 0; /* we didnt copy anything so advance anyway */
      }
    return 1; /* 1 == show ui, and wait for user, 0 == just continue */

diff --git a/src/modules/wizard/page_050.c b/src/modules/wizard/page_050.c
index a1d2506ed5f6611c63d415d3155909ae4f539840..db552b49a26dc5787802d1a903776b9b2b8148d5 100644 (file)
--- a/src/modules/wizard/page_050.c
+++ b/src/modules/wizard/page_050.c
@@ -6,7 +6,7 @@ static double scale = 1.0;
 static Eina_List *obs = NULL;
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_060.c b/src/modules/wizard/page_060.c
index ae6e6e4649f9ba9dd6a738344dbfacf856b739cc..c7f4f6be0e7b1c92e54aa1cabaecd4ac4bb18a04 100644 (file)
--- a/src/modules/wizard/page_060.c
+++ b/src/modules/wizard/page_060.c
@@ -5,7 +5,7 @@
 static int focus_mode = 1;
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_070.c b/src/modules/wizard/page_070.c
index 203279c8b19ea37a491a1c8d0a85fc41786620f2..876edffd9e635dbf63713e1db7e0c22a1c1a1f07 100644 (file)
--- a/src/modules/wizard/page_070.c
+++ b/src/modules/wizard/page_070.c
@@ -3,8 +3,9 @@
 #include "e_mod_main.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons)
 {
+   *need_xdg_icons = EINA_TRUE;
    return 1;
 }
 
@@ -67,4 +68,3 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
 {
    return 1;
 }
-

diff --git a/src/modules/wizard/page_080.c b/src/modules/wizard/page_080.c
index b7c8e52d24de619c76e0faa296e3f5dc5c8a66e3..cc650f7a787d938691b5f1021e8fd0af056b3b6f 100644 (file)
--- a/src/modules/wizard/page_080.c
+++ b/src/modules/wizard/page_080.c
@@ -3,8 +3,9 @@
 #include "e_mod_main.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons __UNUSED__)
 {
+   *need_xdg_desktops = EINA_TRUE;
    return 1;
 }
 
@@ -73,4 +74,3 @@ wizard_page_apply(E_Wizard_Page *pg __UNUSED__)
 {
    return 1;
 }
-

diff --git a/src/modules/wizard/page_090.c b/src/modules/wizard/page_090.c
index 09199cada568134b477e685ef6eac8306d96aa56..70a14c4edbd327c76bf47215a3be9860cb67ebaa 100644 (file)
--- a/src/modules/wizard/page_090.c
+++ b/src/modules/wizard/page_090.c
@@ -33,7 +33,7 @@ read_file(const char *file)
 }
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_100.c b/src/modules/wizard/page_100.c
index b898d0a1cec7820bf340ec34d5abea8d36c09dee..18b3234761f8fbc6155eb8fa82cd6eab06625dca 100644 (file)
--- a/src/modules/wizard/page_100.c
+++ b/src/modules/wizard/page_100.c
@@ -32,7 +32,7 @@ read_file(const char *file)
 #endif
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c
index 9521e0a3d1f132a373e14076a57ad393f31d705b..d108668fbb129859c5ed1a7d7b50527831088a72 100644 (file)
--- a/src/modules/wizard/page_110.c
+++ b/src/modules/wizard/page_110.c
@@ -98,7 +98,7 @@ _check_connman_owner(void *data, DBusMessage *msg,
 #endif
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_120.c b/src/modules/wizard/page_120.c
index 6123808ae7784c7fc93221fe70f87da79191bc75..cd0b69298ba17d204157ad8dc1da177c9aeb576d 100644 (file)
--- a/src/modules/wizard/page_120.c
+++ b/src/modules/wizard/page_120.c
@@ -32,7 +32,7 @@
  */
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_130.c b/src/modules/wizard/page_130.c
index 5b2b201300ec705cd6a5e596a989b6ae0697a54d..9d0383919ed6d95b0daf05868c6db2f3d8aee217 100644 (file)
--- a/src/modules/wizard/page_130.c
+++ b/src/modules/wizard/page_130.c
@@ -3,7 +3,7 @@
 #include "e_mod_main.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_140.c b/src/modules/wizard/page_140.c
index 8215961a988b30fc5bf3988861a12cba952767aa..797559085fd6bc403e8642578c7068c4e148c36a 100644 (file)
--- a/src/modules/wizard/page_140.c
+++ b/src/modules/wizard/page_140.c
@@ -3,7 +3,7 @@
 #include "e_mod_main.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_150.c b/src/modules/wizard/page_150.c
index d997eef7ea64d2b5e37e02087016a2be6bb60057..8a450006d1c2d167c521a4835205c4aa4c3b2ab9 100644 (file)
--- a/src/modules/wizard/page_150.c
+++ b/src/modules/wizard/page_150.c
@@ -48,7 +48,7 @@ match_xorg_log(const char *globbing)
 }
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_160.c b/src/modules/wizard/page_160.c
index 841af63c4a5eee99610bd9b961daedea3e4d47e5..5b163f2e0cb1f0b817047895302b3aa53cedb142 100644 (file)
--- a/src/modules/wizard/page_160.c
+++ b/src/modules/wizard/page_160.c
@@ -3,7 +3,7 @@
 #include "e_mod_main.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_170.c b/src/modules/wizard/page_170.c
index 7ae75b139d6cb22cba18e8169b9fa7793cf6f1dd..8db5addc09646adc495cdc8e0c43dd71dfbd42b7 100644 (file)
--- a/src/modules/wizard/page_170.c
+++ b/src/modules/wizard/page_170.c
@@ -5,7 +5,7 @@
 static int do_up = 1;
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_180.c b/src/modules/wizard/page_180.c
index 2f7b104397d34e2419dc0445d9aa12b4a864143f..773c863d056ac20dfce2d6900c6d0062f1721de7 100644 (file)
--- a/src/modules/wizard/page_180.c
+++ b/src/modules/wizard/page_180.c
@@ -5,7 +5,7 @@
 static int do_tasks = 1;
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }

diff --git a/src/modules/wizard/page_200.c b/src/modules/wizard/page_200.c
index 5ab941ae53be37be3b4576cb2afd8275070dc759..7b0f4d44a6374192741171211f77d70785adf982 100644 (file)
--- a/src/modules/wizard/page_200.c
+++ b/src/modules/wizard/page_200.c
@@ -3,7 +3,7 @@
 #include "e_mod_main.h"
 
 EAPI int
-wizard_page_init(E_Wizard_Page *pg __UNUSED__)
+wizard_page_init(E_Wizard_Page *pg __UNUSED__, Eina_Bool *need_xdg_desktops __UNUSED__, Eina_Bool *need_xdg_icons __UNUSED__)
 {
    return 1;
 }