discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=5995b13b14a3c89cbc40b00a728d6708069f215b

commit 5995b13b14a3c89cbc40b00a728d6708069f215b
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Apr 16 15:16:50 2015 -0400

    prune no_display desktops from evry apps plugin
    
    probably fix T2256
---
 src/modules/everything/evry_plug_apps.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/modules/everything/evry_plug_apps.c 
b/src/modules/everything/evry_plug_apps.c
index 89751d6..366d4cf 100644
--- a/src/modules/everything/evry_plug_apps.c
+++ b/src/modules/everything/evry_plug_apps.c
@@ -455,7 +455,7 @@ _desktop_list_get(void)
 {
    Eina_List *apps = NULL;
    Eina_List *cat_ss;
-   Eina_List *ll;
+   Eina_List *l, *ll;
    Efreet_Desktop *d;
 
    apps = efreet_util_desktop_name_glob_list("*");
@@ -473,6 +473,12 @@ _desktop_list_get(void)
 
         efreet_desktop_free(d);
      }
+   EINA_LIST_FOREACH_SAFE(apps, l, ll, d)
+     {
+        if (!d->no_display) continue;
+        apps = eina_list_remove_list(apps, l);
+        efreet_desktop_free(d);
+     }
 
    return apps;
 }
@@ -508,7 +514,7 @@ _hist_items_get_cb(const Eina_Hash *hash EINA_UNUSED, const 
void *key, void *dat
              EINA_LIST_FOREACH (p->apps_all, ll, d)
                if (d->exec && !strcmp(d->exec, exec)) break;
 
-             if (d)
+             if (d && (!d->no_display))
                {
                   efreet_desktop_ref(d);
                   apps_cache = eina_list_append(apps_cache, d);
@@ -729,7 +735,7 @@ _begin_mime(Evry_Plugin *plugin, const Evry_Item *item)
 
         EINA_LIST_FREE (l, d)
           {
-             if (!eina_list_data_find_list(p->apps_mime, d))
+             if ((!d->no_display) && (!eina_list_data_find_list(p->apps_mime, 
d)))
                p->apps_mime = eina_list_append(p->apps_mime, d);
              else
                efreet_desktop_free(d);
@@ -742,7 +748,7 @@ _begin_mime(Evry_Plugin *plugin, const Evry_Item *item)
 
         EINA_LIST_FREE (l, d)
           {
-             if (!eina_list_data_find_list(p->apps_mime, d))
+             if ((!d->no_display) && (!eina_list_data_find_list(p->apps_mime, 
d)))
                p->apps_mime = eina_list_append(p->apps_mime, d);
              else
                efreet_desktop_free(d);

-- 


Reply via email to