[Xfce4-commits] <thunar:master> Hide applications that are not visible (bug #9169).

[Nick Schermer]

Updating branch refs/heads/master
         to 159346a32e6d014267f45daed2ba7491f7b95838 (commit)
       from a34d540c346166768bce2caf13807a851fb2bfd9 (commit)

commit 159346a32e6d014267f45daed2ba7491f7b95838
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Sep 25 20:08:40 2012 +0200

    Hide applications that are not visible (bug #9169).
    
    Check if they have NoDisplay set or OnlyShowIn doesn't match.

 thunar/thunar-chooser-model.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/thunar/thunar-chooser-model.c b/thunar/thunar-chooser-model.c
index 1fa5b9c..2649bf0 100644
--- a/thunar/thunar-chooser-model.c
+++ b/thunar/thunar-chooser-model.c
@@ -207,6 +207,7 @@ thunar_chooser_model_append (ThunarChooserModel *model,
   GtkTreeIter parent_iter;
   GIcon      *icon;
   GList      *lp;
+  gboolean    inserted_infos = FALSE;
 
   _thunar_return_if_fail (THUNAR_IS_CHOOSER_MODEL (model));
   _thunar_return_if_fail (title != NULL);
@@ -229,6 +230,10 @@ thunar_chooser_model_append (ThunarChooserModel *model,
       /* insert the program items */
       for (lp = app_infos; lp != NULL; lp = lp->next)
         {
+          /* skip infos that have NoDisplay or OnlyShowIn set */
+          if (!g_app_info_should_show (lp->data))
+            continue;
+
           /* append the tree row with the program data */
           gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &parent_iter);
           gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter,
@@ -236,9 +241,12 @@ thunar_chooser_model_append (ThunarChooserModel *model,
                               THUNAR_CHOOSER_MODEL_COLUMN_ICON, g_app_info_get_icon (lp->data),
                               THUNAR_CHOOSER_MODEL_COLUMN_APPLICATION, lp->data,
                               -1);
+
+          inserted_infos = TRUE;
         }
     }
-  else
+  
+  if (!inserted_infos)
     {
       /* tell the user that we don't have any applications for this category */
       gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &parent_iter);