summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-21 10:02:27 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-21 10:02:27 +0000
commitb13ca641f7d9842c384eb25888a64bb530f97ada (patch)
tree929dac8679ca60449a431100e549d4dcf84961c5
parente9ea6454d9076767c1b2e996325318d0cf1c301b (diff)
ensure we get a properly stringshared return value here to match state of e_path_find
SVN revision: 81527
-rw-r--r--src/bin/e_bg.c6
-rw-r--r--src/bin/e_bg.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 34bcd213f..97d193e7b 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -144,7 +144,7 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
144 return bg; 144 return bg;
145} 145}
146 146
147EAPI const char * 147EAPI Eina_Stringshare *
148e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y) 148e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
149{ 149{
150 const E_Config_Desktop_Background *cfbg; 150 const E_Config_Desktop_Background *cfbg;
@@ -188,8 +188,8 @@ e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
188 else if ((bgfile) && (bgfile[0])) 188 else if ((bgfile) && (bgfile[0]))
189 ok = 1; 189 ok = 1;
190 if (!ok) 190 if (!ok)
191 bgfile = e_theme_edje_file_get("base/theme/background", 191 bgfile = eina_stringshare_add(e_theme_edje_file_get("base/theme/background",
192 "e/desktop/background"); 192 "e/desktop/background"));
193 } 193 }
194 194
195 return bgfile; 195 return bgfile;
diff --git a/src/bin/e_bg.h b/src/bin/e_bg.h
index c5e07a739..a1bc42f55 100644
--- a/src/bin/e_bg.h
+++ b/src/bin/e_bg.h
@@ -29,7 +29,7 @@ EINTERN int e_bg_init(void);
29EINTERN int e_bg_shutdown(void); 29EINTERN int e_bg_shutdown(void);
30 30
31EAPI const E_Config_Desktop_Background *e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y); 31EAPI const E_Config_Desktop_Background *e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y);
32EAPI const char *e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y); 32EAPI Eina_Stringshare *e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y);
33EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition); 33EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition);
34EAPI void e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file); 34EAPI void e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file);
35EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y); 35EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y);