forked from enlightenment/efl
parent
5608f9adcf
commit
036f824be9
|
@ -743,9 +743,9 @@ _ecore_desktop_destroy(Ecore_Desktop * desktop)
|
|||
IFFREE(desktop->window_name);
|
||||
IFFREE(desktop->window_title);
|
||||
IFFREE(desktop->window_role);
|
||||
IFFREE(desktop->NotShowIn);
|
||||
IFFREE(desktop->OnlyShowIn);
|
||||
IFFREE(desktop->Categories);
|
||||
if (desktop->NotShowIn) ecore_hash_destroy(desktop->NotShowIn);
|
||||
if (desktop->OnlyShowIn) ecore_hash_destroy(desktop->OnlyShowIn);
|
||||
if (desktop->Categories) ecore_hash_destroy(desktop->Categories);
|
||||
if (desktop->data)
|
||||
{
|
||||
ecore_hash_destroy(desktop->data);
|
||||
|
|
|
@ -575,6 +575,8 @@ _ecore_desktop_icon_theme_destroy(Ecore_Desktop_Icon_Theme * icon_theme)
|
|||
free(icon_theme->directories);
|
||||
if (icon_theme->Directories)
|
||||
ecore_list_destroy(icon_theme->Directories);
|
||||
if (icon_theme->Inherits)
|
||||
ecore_list_destroy(icon_theme->Inherits);
|
||||
free(icon_theme);
|
||||
}
|
||||
|
||||
|
|
|
@ -315,10 +315,10 @@ _ecore_desktop_menu_get0(char *file, Ecore_Desktop_Tree * merge_stack,
|
|||
{
|
||||
E_FN_DEL(ecore_desktop_tree_del, (merge_stack));
|
||||
}
|
||||
E_FREE(data.path);
|
||||
E_FREE(data.base);
|
||||
E_FN_DEL(ecore_desktop_tree_del, (data.stack));
|
||||
}
|
||||
E_FN_DEL(ecore_desktop_tree_del, (data.stack));
|
||||
E_FREE(data.path);
|
||||
E_FREE(data.base);
|
||||
|
||||
return menu_xml;
|
||||
}
|
||||
|
|
|
@ -64,6 +64,7 @@ ecore_desktop_xmlame_get(char *file)
|
|||
ecore_desktop_tree_extend(tree, file);
|
||||
_ecore_desktop_xmlame_parse(tree, buffer);
|
||||
}
|
||||
//FIXME: free(buffer);
|
||||
}
|
||||
return tree;
|
||||
}
|
||||
|
@ -89,7 +90,7 @@ _ecore_desktop_xmlame_parse(Ecore_Desktop_Tree * tree, char *buffer)
|
|||
|
||||
t = *buffer;
|
||||
*buffer = '\0';
|
||||
ecore_desktop_tree_extend(tree, strdup(text));
|
||||
ecore_desktop_tree_extend(tree, text);
|
||||
*buffer = t;
|
||||
}
|
||||
if (*buffer != '\0')
|
||||
|
|
Loading…
Reference in New Issue