summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-03-20 10:05:28 -0400
committerChris Michael <cp.michael@samsung.com>2015-03-20 10:05:28 -0400
commit437107436c123755da316e903bfb43f3e6a1cd28 (patch)
tree86fb3323e4e861d28faeaee102a9586a32046f8c
parentdea2731db49833423cac97abbac7df2bc1206579 (diff)
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.michael@samsung.com>
-rw-r--r--src/e_int_config_wallpaper.c15
1 files 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)
976 E_Config_Desktop_Background *cfbg; 976 E_Config_Desktop_Background *cfbg;
977 977
978 cfbg = e_config->desktop_backgrounds->data; 978 cfbg = e_config->desktop_backgrounds->data;
979 e_bg_del(cfbg->manager, cfbg->zone, cfbg->desk_x, cfbg->desk_y); 979 e_bg_del(cfbg->zone, cfbg->desk_x, cfbg->desk_y);
980 } 980 }
981 if ((info->use_theme_bg) || (!info->bg_file)) 981 if ((info->use_theme_bg) || (!info->bg_file))
982 e_bg_default_set(NULL); 982 e_bg_default_set(NULL);
@@ -986,9 +986,8 @@ _apply(void *data, void *data2 EINA_UNUSED)
986 else if (info->mode == 1) 986 else if (info->mode == 1)
987 { 987 {
988 /* specific desk */ 988 /* specific desk */
989 e_bg_del(info->man_num, info->zone_num, info->desk_x, info->desk_y); 989 e_bg_del(info->zone_num, info->desk_x, info->desk_y);
990 e_bg_add(info->man_num, info->zone_num, info->desk_x, info->desk_y, 990 e_bg_add(info->zone_num, info->desk_x, info->desk_y, info->bg_file);
991 info->bg_file);
992 } 991 }
993 else 992 else
994 { 993 {
@@ -1002,8 +1001,8 @@ _apply(void *data, void *data2 EINA_UNUSED)
1002 dlist = eina_list_append(dlist, cfbg); 1001 dlist = eina_list_append(dlist, cfbg);
1003 } 1002 }
1004 EINA_LIST_FREE(dlist, cfbg) 1003 EINA_LIST_FREE(dlist, cfbg)
1005 e_bg_del(cfbg->manager, cfbg->zone, cfbg->desk_x, cfbg->desk_y); 1004 e_bg_del(cfbg->zone, cfbg->desk_x, cfbg->desk_y);
1006 e_bg_add(info->man_num, info->zone_num, -1, -1, info->bg_file); 1005 e_bg_add(info->zone_num, -1, -1, info->bg_file);
1007 } 1006 }
1008 e_bg_update(); 1007 e_bg_update();
1009 e_config_save_queue(); 1008 e_config_save_queue();
@@ -1123,10 +1122,10 @@ wp_browser_new(E_Comp *comp)
1123 info->desk_x = desk->x; 1122 info->desk_x = desk->x;
1124 info->desk_y = desk->y; 1123 info->desk_y = desk->y;
1125 info->mode = 0; 1124 info->mode = 0;
1126 cfbg = e_bg_config_get(comp->num, zone->num, desk->x, desk->y); 1125 cfbg = e_bg_config_get(zone->num, desk->x, desk->y);
1127 if (cfbg) 1126 if (cfbg)
1128 { 1127 {
1129 if ((cfbg->manager >= 0) && (cfbg->zone >= 0)) 1128 if (cfbg->zone >= 0)
1130 { 1129 {
1131 if ((cfbg->desk_x >= 0) && (cfbg->desk_y >= 0)) 1130 if ((cfbg->desk_x >= 0) && (cfbg->desk_y >= 0))
1132 info->mode = 1; 1131 info->mode = 1;