summaryrefslogtreecommitdiff
path: root/src/bin/e_bg.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-03-19 16:54:50 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-03-19 16:54:50 -0400
commitb6eb3191462ec49b5d1cf968b52d6ec2802fca77 (patch)
tree50b4e57262da03d1308b5f36dba6b8ffa626d2c8 /src/bin/e_bg.c
parent58447e95081cad3e1885df585bcdf7771f8393b4 (diff)
remove manager/container id from bg/wallpaper things
Diffstat (limited to 'src/bin/e_bg.c')
-rw-r--r--src/bin/e_bg.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 7d94d6d..42fe143 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -319,7 +319,6 @@ e_bg_default_set(const char *file)
319 e_config->desktop_default_background = NULL; 319 e_config->desktop_default_background = NULL;
320 320
321 ev = E_NEW(E_Event_Bg_Update, 1); 321 ev = E_NEW(E_Event_Bg_Update, 1);
322 ev->manager = -1;
323 ev->zone = -1; 322 ev->zone = -1;
324 ev->desk_x = -1; 323 ev->desk_x = -1;
325 ev->desk_y = -1; 324 ev->desk_y = -1;
@@ -327,7 +326,7 @@ e_bg_default_set(const char *file)
327} 326}
328 327
329EAPI void 328EAPI void
330e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file) 329e_bg_add(int zone, int desk_x, int desk_y, const char *file)
331{ 330{
332 const Eina_List *l; 331 const Eina_List *l;
333 E_Config_Desktop_Background *cfbg; 332 E_Config_Desktop_Background *cfbg;
@@ -338,7 +337,6 @@ e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
338 EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg) 337 EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
339 { 338 {
340 if ((cfbg) && 339 if ((cfbg) &&
341 (cfbg->manager == manager) &&
342 (cfbg->zone == zone) && 340 (cfbg->zone == zone) &&
343 (cfbg->desk_x == desk_x) && 341 (cfbg->desk_x == desk_x) &&
344 (cfbg->desk_y == desk_y) && 342 (cfbg->desk_y == desk_y) &&
@@ -349,9 +347,8 @@ e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
349 } 347 }
350 } 348 }
351 349
352 e_bg_del(manager, zone, desk_x, desk_y); 350 e_bg_del(zone, desk_x, desk_y);
353 cfbg = E_NEW(E_Config_Desktop_Background, 1); 351 cfbg = E_NEW(E_Config_Desktop_Background, 1);
354 cfbg->manager = manager;
355 cfbg->zone = zone; 352 cfbg->zone = zone;
356 cfbg->desk_x = desk_x; 353 cfbg->desk_x = desk_x;
357 cfbg->desk_y = desk_y; 354 cfbg->desk_y = desk_y;
@@ -361,7 +358,6 @@ e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
361 e_filereg_register(cfbg->file); 358 e_filereg_register(cfbg->file);
362 359
363 ev = E_NEW(E_Event_Bg_Update, 1); 360 ev = E_NEW(E_Event_Bg_Update, 1);
364 ev->manager = manager;
365 ev->zone = zone; 361 ev->zone = zone;
366 ev->desk_x = desk_x; 362 ev->desk_x = desk_x;
367 ev->desk_y = desk_y; 363 ev->desk_y = desk_y;
@@ -369,7 +365,7 @@ e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
369} 365}
370 366
371EAPI void 367EAPI void
372e_bg_del(int manager, int zone, int desk_x, int desk_y) 368e_bg_del(int zone, int desk_x, int desk_y)
373{ 369{
374 Eina_List *l; 370 Eina_List *l;
375 E_Config_Desktop_Background *cfbg; 371 E_Config_Desktop_Background *cfbg;
@@ -378,8 +374,7 @@ e_bg_del(int manager, int zone, int desk_x, int desk_y)
378 EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg) 374 EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
379 { 375 {
380 if (!cfbg) continue; 376 if (!cfbg) continue;
381 if ((cfbg->manager == manager) && (cfbg->zone == zone) && 377 if ((cfbg->desk_x == desk_x) && (cfbg->desk_y == desk_y))
382 (cfbg->desk_x == desk_x) && (cfbg->desk_y == desk_y))
383 { 378 {
384 e_config->desktop_backgrounds = eina_list_remove_list(e_config->desktop_backgrounds, l); 379 e_config->desktop_backgrounds = eina_list_remove_list(e_config->desktop_backgrounds, l);
385 e_filereg_deregister(cfbg->file); 380 e_filereg_deregister(cfbg->file);
@@ -390,7 +385,6 @@ e_bg_del(int manager, int zone, int desk_x, int desk_y)
390 } 385 }
391 386
392 ev = E_NEW(E_Event_Bg_Update, 1); 387 ev = E_NEW(E_Event_Bg_Update, 1);
393 ev->manager = manager;
394 ev->zone = zone; 388 ev->zone = zone;
395 ev->desk_x = desk_x; 389 ev->desk_x = desk_x;
396 ev->desk_y = desk_y; 390 ev->desk_y = desk_y;