Merge lp:~daker/xdg-launcher/fix.689013 into lp:xdg-launcher

[Adnane Belmadiaf]

Unmerged revisions

7. By Adnane Belmadiaf on 2010-12-14

* Fixed bug 689013

=== modified file 'xdglauncher.py'
--- xdglauncher.py	2010-12-13 19:10:28 +0000
+++ xdglauncher.py	2010-12-14 12:07:55 +0000
@@ -34,7 +34,7 @@
         self.__rebuild_lock = Lock()
         self.__schedule_id = {self.__tree: None,}
         self.__schedule_lock = Lock()
-        self.__menu_rebuild_delay = 2
+        self.__menu_rebuild_delay = 1
         self.__menu_name = menu_name
         launchers = []
 
@@ -78,7 +78,7 @@
         import math
         launchers = []
         if not rebuild:
-            menu = gmenu.lookup_tree(self.__tree)
+            menu = gmenu.lookup_tree(self.__tree, gmenu.FLAGS_INCLUDE_EXCLUDED)
             menu.add_monitor(self.menu_changed_cb, launchers)
             if not self.__menu_name.startswith('/'):
                self.__menu_name = '/%s'%self.__menu_name
@@ -87,7 +87,7 @@
             entries = tree.get_directory_from_path(self.__menu_name)
 
         for e in entries.get_contents():
-            if isinstance(e, gmenu.Entry):
+            if isinstance(e, gmenu.Entry) and not e.is_excluded:
                 launchers.append(e)
 
         self.screen_width, self.screen_height = gtk.gdk.screen_width(), gtk.gdk.screen_height()