evry-files: show homedir option is obsolete. turning it off produced a segv
SVN revision: 53401
This commit is contained in:
parent
a751cbca6d
commit
68063b6523
|
@ -318,7 +318,7 @@ _scan_cancel_func(void *data)
|
||||||
Plugin *p = d->plugin;
|
Plugin *p = d->plugin;
|
||||||
Evry_Item_File *file;
|
Evry_Item_File *file;
|
||||||
|
|
||||||
if (!d->run_cnt)
|
if (!d->run_cnt) /* _scan_func was canceled */
|
||||||
{
|
{
|
||||||
EINA_LIST_FREE(d->files, file)
|
EINA_LIST_FREE(d->files, file)
|
||||||
{
|
{
|
||||||
|
@ -327,7 +327,7 @@ _scan_cancel_func(void *data)
|
||||||
free(file);
|
free(file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else /* _scan_mime_func was canceled */
|
||||||
{
|
{
|
||||||
EINA_LIST_FREE(d->files, file)
|
EINA_LIST_FREE(d->files, file)
|
||||||
EVRY_ITEM_FREE(file);
|
EVRY_ITEM_FREE(file);
|
||||||
|
@ -340,7 +340,6 @@ _scan_cancel_func(void *data)
|
||||||
|
|
||||||
free(d->directory);
|
free(d->directory);
|
||||||
E_FREE(d);
|
E_FREE(d);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -642,8 +641,8 @@ _begin(Evry_Plugin *plugin, const Evry_Item *it)
|
||||||
EVRY_PLUGIN_INSTANCE(p, plugin);
|
EVRY_PLUGIN_INSTANCE(p, plugin);
|
||||||
p->parent = EINA_FALSE;
|
p->parent = EINA_FALSE;
|
||||||
|
|
||||||
if (_conf->show_homedir)
|
/* if (_conf->show_homedir) */
|
||||||
p->directory = eina_stringshare_add(e_user_homedir_get());
|
p->directory = eina_stringshare_add(e_user_homedir_get());
|
||||||
|
|
||||||
_read_directory(p);
|
_read_directory(p);
|
||||||
|
|
||||||
|
@ -1546,9 +1545,9 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||||
of = e_widget_framelist_add(evas, _("General"), 0);
|
of = e_widget_framelist_add(evas, _("General"), 0);
|
||||||
e_widget_framelist_content_align_set(of, 0.0, 0.0);
|
e_widget_framelist_content_align_set(of, 0.0, 0.0);
|
||||||
|
|
||||||
ow = e_widget_check_add(evas, _("Show home directory"),
|
/* ow = e_widget_check_add(evas, _("Show home directory"),
|
||||||
&(cfdata->show_homedir));
|
* &(cfdata->show_homedir));
|
||||||
e_widget_framelist_object_append(of, ow);
|
* e_widget_framelist_object_append(of, ow); */
|
||||||
|
|
||||||
ow = e_widget_check_add(evas, _("Show recent files"),
|
ow = e_widget_check_add(evas, _("Show recent files"),
|
||||||
&(cfdata->show_recent));
|
&(cfdata->show_recent));
|
||||||
|
|
Loading…
Reference in New Issue