summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Janetzek <hannes.janetzek@gmail.com>2010-10-14 14:25:12 +0000
committerHannes Janetzek <hannes.janetzek@gmail.com>2010-10-14 14:25:12 +0000
commit68063b6523de7c3680487373ae8b92ed4b15f35b (patch)
treeac9d0e67a42f99917f995a42d03133f86958fbbe
parenta751cbca6dbf0882faa0d767b4efe77eec7e9794 (diff)
evry-files: show homedir option is obsolete. turning it off produced a segv
SVN revision: 53401
-rw-r--r--src/modules/everything-files/e_mod_main.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/modules/everything-files/e_mod_main.c b/src/modules/everything-files/e_mod_main.c
index d4d7d1e59..49032fed1 100644
--- a/src/modules/everything-files/e_mod_main.c
+++ b/src/modules/everything-files/e_mod_main.c
@@ -318,7 +318,7 @@ _scan_cancel_func(void *data)
318 Plugin *p = d->plugin; 318 Plugin *p = d->plugin;
319 Evry_Item_File *file; 319 Evry_Item_File *file;
320 320
321 if (!d->run_cnt) 321 if (!d->run_cnt) /* _scan_func was canceled */
322 { 322 {
323 EINA_LIST_FREE(d->files, file) 323 EINA_LIST_FREE(d->files, file)
324 { 324 {
@@ -327,7 +327,7 @@ _scan_cancel_func(void *data)
327 free(file); 327 free(file);
328 } 328 }
329 } 329 }
330 else 330 else /* _scan_mime_func was canceled */
331 { 331 {
332 EINA_LIST_FREE(d->files, file) 332 EINA_LIST_FREE(d->files, file)
333 EVRY_ITEM_FREE(file); 333 EVRY_ITEM_FREE(file);
@@ -340,7 +340,6 @@ _scan_cancel_func(void *data)
340 340
341 free(d->directory); 341 free(d->directory);
342 E_FREE(d); 342 E_FREE(d);
343
344} 343}
345 344
346static void 345static void
@@ -642,8 +641,8 @@ _begin(Evry_Plugin *plugin, const Evry_Item *it)
642 EVRY_PLUGIN_INSTANCE(p, plugin); 641 EVRY_PLUGIN_INSTANCE(p, plugin);
643 p->parent = EINA_FALSE; 642 p->parent = EINA_FALSE;
644 643
645 if (_conf->show_homedir) 644 /* if (_conf->show_homedir) */
646 p->directory = eina_stringshare_add(e_user_homedir_get()); 645 p->directory = eina_stringshare_add(e_user_homedir_get());
647 646
648 _read_directory(p); 647 _read_directory(p);
649 648
@@ -1546,9 +1545,9 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
1546 of = e_widget_framelist_add(evas, _("General"), 0); 1545 of = e_widget_framelist_add(evas, _("General"), 0);
1547 e_widget_framelist_content_align_set(of, 0.0, 0.0); 1546 e_widget_framelist_content_align_set(of, 0.0, 0.0);
1548 1547
1549 ow = e_widget_check_add(evas, _("Show home directory"), 1548 /* ow = e_widget_check_add(evas, _("Show home directory"),
1550 &(cfdata->show_homedir)); 1549 * &(cfdata->show_homedir));
1551 e_widget_framelist_object_append(of, ow); 1550 * e_widget_framelist_object_append(of, ow); */
1552 1551
1553 ow = e_widget_check_add(evas, _("Show recent files"), 1552 ow = e_widget_check_add(evas, _("Show recent files"),
1554 &(cfdata->show_recent)); 1553 &(cfdata->show_recent));