Use efreet_desktop_new where appropriate

efreet_desktop_get (will in time) setup a lot of stuff to monitor
changes. If we just use the results from efreet_desktop_get within one
function and then free, this is unneeded overhead. efreet_desktop_free
will more lightweight (but require a bit more mem alloc).

SVN revision: 46847
This commit is contained in:
Sebastian Dransfeld 2010-03-03 22:10:55 +00:00
parent be71ec56a9
commit 66b667f273
6 changed files with 10 additions and 9 deletions

View File

@ -294,7 +294,7 @@ _load_modules(const char *dir, Eina_Hash *types_hash)
snprintf(modpath + modpathlen, sizeof(modpath) - modpathlen,
"%s/module.desktop", mod);
if (!ecore_file_exists(modpath)) goto end_mod;
if (!(desk = efreet_desktop_get(modpath))) goto end_mod;
if (!(desk = efreet_desktop_new(modpath))) goto end_mod;
if (desk->x)
type = eina_hash_find(desk->x, "X-Enlightenment-ModuleType");

View File

@ -386,7 +386,7 @@ _set_description(void *data, const char *name)
snprintf(buf, sizeof(buf), "%s/module.desktop", e_module_dir_get(mod));
if (!ecore_file_exists(buf)) return;
if (!(desk = efreet_desktop_get(buf))) return;
if (!(desk = efreet_desktop_new(buf))) return;
if (desk->comment)
e_widget_textblock_markup_set(cfdata->o_desc, desk->comment);
efreet_desktop_free(desk);

View File

@ -379,7 +379,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body)
snprintf(buf, sizeof(buf), "%s/module.desktop", e_module_dir_get(m));
desktop = efreet_desktop_get(buf);
desktop = efreet_desktop_new(buf);
if ((desktop) && (desktop->icon))
{
icon = efreet_icon_path_find(e_config->icon_theme, desktop->icon, 64);

View File

@ -191,7 +191,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
}
pdir = e_config_profile_dir_get(prof);
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_get(buf);
desk = efreet_desktop_new(buf);
if (!desk)
{
e_prefix_data_snprintf(buf, sizeof(buf), "data/config/%s/", prof);
@ -199,7 +199,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
if (pdir)
{
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_get(buf);
desk = efreet_desktop_new(buf);
}
}
label = prof;
@ -249,7 +249,7 @@ _ilist_cb_selected(void *data)
pdir = e_config_profile_dir_get(cfdata->sel_profile);
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_get(buf);
desk = efreet_desktop_new(buf);
if (!desk)
{
e_prefix_data_snprintf(buf, sizeof(buf), "data/config/%s/", cfdata->sel_profile);
@ -257,7 +257,7 @@ _ilist_cb_selected(void *data)
if (pdir)
{
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_get(buf);
desk = efreet_desktop_new(buf);
}
}

View File

@ -23,7 +23,7 @@ _profile_change(void *data, Evas_Object *obj)
return;
}
snprintf(buf, sizeof(buf), "%s/profile.desktop", dir);
desk = efreet_desktop_get(buf);
desk = efreet_desktop_new(buf);
if (desk)
e_widget_textblock_markup_set(textblock, desk->comment);
else
@ -96,7 +96,7 @@ wizard_page_show(E_Wizard_Page *pg)
continue;
}
snprintf(buf, sizeof(buf), "%s/profile.desktop", dir);
desk = efreet_desktop_get(buf);
desk = efreet_desktop_new(buf);
label = prof;
if ((desk) && (desk->name)) label = desk->name;
snprintf(buf, sizeof(buf), "%s/icon.edj", dir);

View File

@ -120,6 +120,7 @@ _app_write(App *a)
a->name, a->generic, a->comment, a->exec, a->icon);
if (a->extra) fprintf(f, "%s\n", a->extra);
fclose(f);
/* TODO: This will leak */
efreet_desktop_get(buf);
}