From e41e945e3ba1714db3c184a70331801b9ef482ff Mon Sep 17 00:00:00 2001
From: rephorm <rephorm>
Date: Sun, 8 Oct 2006 21:15:21 +0000
Subject: [PATCH] break code that finds bg file for a zone into a separate
 function

SVN revision: 26433
---
 src/bin/e_bg.c | 29 +++++++++++++++++++----------
 src/bin/e_bg.h |  1 +
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index d1e64220d..6d81f1d3c 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -9,20 +9,12 @@ static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, con
 /* local subsystem globals */
 
 /* externally accessible functions */
-EAPI void
-e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
+EAPI const char *
+e_bg_file_get(E_Zone *zone)
 {
-   Evas_Object *o;
    Evas_List *l, *ll, *entries;
    int ok;
    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;
    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");
 	  }
      }
+   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)
      {
 	const char *pfile = "";
diff --git a/src/bin/e_bg.h b/src/bin/e_bg.h
index df1d08c02..dd0c1e2a8 100644
--- a/src/bin/e_bg.h
+++ b/src/bin/e_bg.h
@@ -14,6 +14,7 @@ typedef enum {
 #ifndef 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_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);