break code that finds bg file for a zone into a separate function

SVN revision: 26433
This commit is contained in:
rephorm 2006-10-08 21:15:21 +00:00 committed by rephorm
parent 570f436e9a
commit e41e945e3b
2 changed files with 20 additions and 10 deletions

View File

@ -9,20 +9,12 @@ static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, con
/* local subsystem globals */ /* local subsystem globals */
/* externally accessible functions */ /* externally accessible functions */
EAPI void EAPI const char *
e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) e_bg_file_get(E_Zone *zone)
{ {
Evas_Object *o;
Evas_List *l, *ll, *entries; Evas_List *l, *ll, *entries;
int ok; int ok;
const char *bgfile = ""; const char *bgfile = "";
const char *trans = "";
if (transition == E_BG_TRANSITION_START) trans = e_config->transition_start;
else if (transition == E_BG_TRANSITION_DESK) trans = e_config->transition_desk;
else if (transition == E_BG_TRANSITION_CHANGE) trans = e_config->transition_change;
if ((!trans) || (strlen(trans) < 1)) transition = E_BG_TRANSITION_NONE;
ok = 0; ok = 0;
for (l = e_config->desktop_backgrounds; l; l = l->next) for (l = e_config->desktop_backgrounds; l; l = l->next)
{ {
@ -73,6 +65,23 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
bgfile = e_theme_edje_file_get("base/theme/background", "e/desktop/background"); bgfile = e_theme_edje_file_get("base/theme/background", "e/desktop/background");
} }
} }
return bgfile;
}
EAPI void
e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
{
Evas_Object *o;
const char *bgfile = "";
const char *trans = "";
if (transition == E_BG_TRANSITION_START) trans = e_config->transition_start;
else if (transition == E_BG_TRANSITION_DESK) trans = e_config->transition_desk;
else if (transition == E_BG_TRANSITION_CHANGE) trans = e_config->transition_change;
if ((!trans) || (strlen(trans) < 1)) transition = E_BG_TRANSITION_NONE;
bgfile = e_bg_file_get(zone);
if (zone->bg_object) if (zone->bg_object)
{ {
const char *pfile = ""; const char *pfile = "";

View File

@ -14,6 +14,7 @@ typedef enum {
#ifndef E_BG_H #ifndef E_BG_H
#define E_BG_H #define E_BG_H
EAPI const char *e_bg_file_get(E_Zone *zone);
EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition); EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition);
EAPI void e_bg_add(int container, int zone, int desk_x, int desk_y, char *file); EAPI void e_bg_add(int container, int zone, int desk_x, int desk_y, char *file);
EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y); EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y);