[EGIT] [enlightenment/modules/wallpaper2] master 01/01: wallpaper2: Update for recent E changes

[Chris Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/enlightenment/modules/wallpaper2.git/commit/?id=437107436c123755da316e903bfb43f3e6a1cd28

commit 437107436c123755da316e903bfb43f3e6a1cd28
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Fri Mar 20 10:05:28 2015 -0400

    wallpaper2: Update for recent E changes
    
    Summary: This allows wallpaper2 to build & run again by following the
    recent changes in Enlightenment (removal of E_Manager, etc)
    
    @fix
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/e_int_config_wallpaper.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/e_int_config_wallpaper.c b/src/e_int_config_wallpaper.c
index f694eca..1382d1f 100644
--- a/src/e_int_config_wallpaper.c
+++ b/src/e_int_config_wallpaper.c
@@ -976,7 +976,7 @@ _apply(void *data, void *data2 EINA_UNUSED)
              E_Config_Desktop_Background *cfbg;
 
              cfbg = e_config->desktop_backgrounds->data;
-             e_bg_del(cfbg->manager, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
+             e_bg_del(cfbg->zone, cfbg->desk_x, cfbg->desk_y);
           }
         if ((info->use_theme_bg) || (!info->bg_file))
           e_bg_default_set(NULL);
@@ -986,9 +986,8 @@ _apply(void *data, void *data2 EINA_UNUSED)
    else if (info->mode == 1)
      {
         /* specific desk */
-        e_bg_del(info->man_num, info->zone_num, info->desk_x, info->desk_y);
-        e_bg_add(info->man_num, info->zone_num, info->desk_x, info->desk_y,
-                 info->bg_file);
+        e_bg_del(info->zone_num, info->desk_x, info->desk_y);
+        e_bg_add(info->zone_num, info->desk_x, info->desk_y, info->bg_file);
      }
    else
      {
@@ -1002,8 +1001,8 @@ _apply(void *data, void *data2 EINA_UNUSED)
                dlist = eina_list_append(dlist, cfbg);
           }
         EINA_LIST_FREE(dlist, cfbg)
-          e_bg_del(cfbg->manager, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
-        e_bg_add(info->man_num, info->zone_num, -1, -1, info->bg_file);
+          e_bg_del(cfbg->zone, cfbg->desk_x, cfbg->desk_y);
+        e_bg_add(info->zone_num, -1, -1, info->bg_file);
      }
    e_bg_update();
    e_config_save_queue();
@@ -1123,10 +1122,10 @@ wp_browser_new(E_Comp *comp)
    info->desk_x = desk->x;
    info->desk_y = desk->y;
    info->mode = 0;
-   cfbg = e_bg_config_get(comp->num, zone->num, desk->x, desk->y);
+   cfbg = e_bg_config_get(zone->num, desk->x, desk->y);
    if (cfbg)
      {
-        if ((cfbg->manager >= 0) && (cfbg->zone >= 0))
+        if (cfbg->zone >= 0)
           {
              if ((cfbg->desk_x >= 0) && (cfbg->desk_y >= 0))
                info->mode = 1;

--