From b13ca641f7d9842c384eb25888a64bb530f97ada Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 21 Dec 2012 10:02:27 +0000 Subject: [PATCH] ensure we get a properly stringshared return value here to match state of e_path_find SVN revision: 81527 --- src/bin/e_bg.c | 6 +++--- src/bin/e_bg.h | 2 +- 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) return bg; } -EAPI const char * +EAPI Eina_Stringshare * e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y) { 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) else if ((bgfile) && (bgfile[0])) ok = 1; if (!ok) - bgfile = e_theme_edje_file_get("base/theme/background", - "e/desktop/background"); + bgfile = eina_stringshare_add(e_theme_edje_file_get("base/theme/background", + "e/desktop/background")); } 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); EINTERN int e_bg_shutdown(void); EAPI const E_Config_Desktop_Background *e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y); -EAPI const char *e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y); +EAPI Eina_Stringshare *e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y); 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, const char *file); EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y);