summaryrefslogtreecommitdiff
path: root/src/bin/e_bg.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-03-18 19:12:32 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-03-18 19:12:32 -0400
commitdbcd03044e2e305369e7d538aa6e1071da5aadab (patch)
tree95aeb8b1fe64fcaf24f4056191b4e5cd6c28a081 /src/bin/e_bg.c
parentbc087bd6f99b68163148001f4a1ed5bd290ce9b1 (diff)
remove manager number from e_bg functions
this is no longer relevant; related code will be removed soon
Diffstat (limited to 'src/bin/e_bg.c')
-rw-r--r--src/bin/e_bg.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index f8c740e..7d94d6d 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -76,7 +76,7 @@ e_bg_shutdown(void)
76 * The most specific match will be returned 76 * The most specific match will be returned
77 */ 77 */
78EAPI const E_Config_Desktop_Background * 78EAPI const E_Config_Desktop_Background *
79e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y) 79e_bg_config_get(int zone_num, int desk_x, int desk_y)
80{ 80{
81 Eina_List *l, *entries; 81 Eina_List *l, *entries;
82 E_Config_Desktop_Background *bg = NULL, *cfbg = NULL; 82 E_Config_Desktop_Background *bg = NULL, *cfbg = NULL;
@@ -85,7 +85,7 @@ e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
85 int current_spec = 0; /* how specific the setting is - we want the least general one that applies */ 85 int current_spec = 0; /* how specific the setting is - we want the least general one that applies */
86 86
87 /* look for desk specific background. */ 87 /* look for desk specific background. */
88 if (manager_num >= 0 || zone_num >= 0 || desk_x >= 0 || desk_y >= 0) 88 if (zone_num >= 0 || desk_x >= 0 || desk_y >= 0)
89 { 89 {
90 EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg) 90 EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
91 { 91 {
@@ -93,9 +93,6 @@ e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
93 93
94 if (!cfbg) continue; 94 if (!cfbg) continue;
95 spec = 0; 95 spec = 0;
96 if (cfbg->manager == manager_num) spec++;
97 else if (cfbg->manager >= 0)
98 continue;
99 if (cfbg->zone == zone_num) spec++; 96 if (cfbg->zone == zone_num) spec++;
100 else if (cfbg->zone >= 0) 97 else if (cfbg->zone >= 0)
101 continue; 98 continue;
@@ -144,13 +141,13 @@ e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
144} 141}
145 142
146EAPI Eina_Stringshare * 143EAPI Eina_Stringshare *
147e_bg_file_get(int manager_num, int zone_num, int desk_x, int desk_y) 144e_bg_file_get(int zone_num, int desk_x, int desk_y)
148{ 145{
149 const E_Config_Desktop_Background *cfbg; 146 const E_Config_Desktop_Background *cfbg;
150 const char *bgfile = NULL; 147 const char *bgfile = NULL;
151 int ok = 0; 148 int ok = 0;
152 149
153 cfbg = e_bg_config_get(manager_num, zone_num, desk_x, desk_y); 150 cfbg = e_bg_config_get(zone_num, desk_x, desk_y);
154 151
155 /* fall back to default */ 152 /* fall back to default */
156 if (cfbg) 153 if (cfbg)
@@ -208,9 +205,9 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
208 205
209 desk = e_desk_current_get(zone); 206 desk = e_desk_current_get(zone);
210 if (desk) 207 if (desk)
211 bgfile = e_bg_file_get(e_comp->num, zone->num, desk->x, desk->y); 208 bgfile = e_bg_file_get(zone->num, desk->x, desk->y);
212 else 209 else
213 bgfile = e_bg_file_get(e_comp->num, zone->num, -1, -1); 210 bgfile = e_bg_file_get(zone->num, -1, -1);
214 211
215 if (zone->bg_object) 212 if (zone->bg_object)
216 { 213 {