styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix a stringshare error in desk config and also a possible crash 

SVN revision: 81528
This commit is contained in:
Mike Blumenkrantz 2012-12-21 10:12:39 +00:00
parent b13ca641f7
commit e8061c0a35
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/conf_display/e_int_config_desk.c
View File

@ -13,7 +13,7 @@ struct _E_Config_Dialog_Data
int zone_num; int zone_num;
int desk_x; int desk_x;
int desk_y; int desk_y;
char *bg; Eina_Stringshare *bg;
char *name; char *name;
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8) #if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
char *profile; char *profile;
@ -60,16 +60,12 @@ static void
_fill_data(E_Config_Dialog_Data *cfdata) _fill_data(E_Config_Dialog_Data *cfdata)
{ {
Eina_List *l; Eina_List *l;
const char *bg;
char name[40]; char name[40];
int ok = 0; int ok = 0;
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8) #if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
E_Config_Desktop_Window_Profile *prof; E_Config_Desktop_Window_Profile *prof;
#endif #endif
bg = e_bg_file_get(cfdata->con_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y); cfdata->bg = e_bg_file_get(cfdata->con_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
if (!bg)
bg = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
cfdata->bg = strdup(bg);
for (l = e_config->desktop_names; l; l = l->next) for (l = e_config->desktop_names; l; l = l->next)
{ {
@ -129,8 +125,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
if (cfdata->hdl) if (cfdata->hdl)
ecore_event_handler_del(cfdata->hdl); ecore_event_handler_del(cfdata->hdl);
if (cfdata->bg) eina_stringshare_del(cfdata->bg);
E_FREE(cfdata->bg);
if (cfdata->name) if (cfdata->name)
E_FREE(cfdata->name); E_FREE(cfdata->name);
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8) #if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
@ -145,10 +140,11 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
char name[40]; char name[40];
if (!cfdata->name[0]) if ((!cfdata->name) || (!cfdata->name[0]))
{ {
snprintf(name, sizeof(name), _(e_config->desktop_default_name), snprintf(name, sizeof(name), _(e_config->desktop_default_name),
cfdata->desk_x, cfdata->desk_y); cfdata->desk_x, cfdata->desk_y);
free(cfdata->name);
cfdata->name = strdup(name); cfdata->name = strdup(name);
} }
@ -254,8 +250,7 @@ _cb_bg_change(void *data, int type, void *event)
file = e_bg_file_get(cfdata->con_num, cfdata->zone_num, file = e_bg_file_get(cfdata->con_num, cfdata->zone_num,
cfdata->desk_x, cfdata->desk_y); cfdata->desk_x, cfdata->desk_y);
E_FREE(cfdata->bg); eina_stringshare_replace(&cfdata->bg, file);
cfdata->bg = strdup(file);
e_widget_preview_edje_set(cfdata->preview, cfdata->bg, e_widget_preview_edje_set(cfdata->preview, cfdata->bg,
"e/desktop/background"); "e/desktop/background");