alacarte r414 - in trunk: . Alacarte

[vuntz svn gnome org]

Author: vuntz
Date: Mon Jan 19 16:41:17 2009
New Revision: 414
URL: http://svn.gnome.org/viewvc/alacarte?rev=414&view=rev

Log:
2009-01-19  Vincent Untz  <vuntz gnome org>

	* Alacarte/MenuEditor.py: show all separators
	* configure.ac: require gnome-menus 2.22.2
	Fix bug #527635


Modified:
   trunk/Alacarte/MenuEditor.py
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/Alacarte/MenuEditor.py
==============================================================================
--- trunk/Alacarte/MenuEditor.py	(original)
+++ trunk/Alacarte/MenuEditor.py	Mon Jan 19 16:41:17 2009
@@ -37,7 +37,7 @@
 
 	def __loadMenus(self):
 		self.applications = Menu()
-		self.applications.tree = gmenu.lookup_tree('applications.menu', gmenu.FLAGS_SHOW_EMPTY|gmenu.FLAGS_INCLUDE_EXCLUDED|gmenu.FLAGS_INCLUDE_NODISPLAY)
+		self.applications.tree = gmenu.lookup_tree('applications.menu', gmenu.FLAGS_SHOW_EMPTY|gmenu.FLAGS_INCLUDE_EXCLUDED|gmenu.FLAGS_INCLUDE_NODISPLAY|gmenu.FLAGS_SHOW_ALL_SEPARATORS)
 		self.applications.visible_tree = gmenu.lookup_tree('applications.menu')
 		self.applications.path = os.path.join(util.getUserMenuPath(), self.applications.tree.get_menu_file())
 		if not os.path.isfile(self.applications.path):
@@ -47,7 +47,7 @@
 		self.__remove_whilespace_nodes(self.applications.dom)
 
 		self.settings = Menu() 	 
-		self.settings.tree = gmenu.lookup_tree('settings.menu', gmenu.FLAGS_SHOW_EMPTY|gmenu.FLAGS_INCLUDE_EXCLUDED|gmenu.FLAGS_INCLUDE_NODISPLAY) 	 
+		self.settings.tree = gmenu.lookup_tree('settings.menu', gmenu.FLAGS_SHOW_EMPTY|gmenu.FLAGS_INCLUDE_EXCLUDED|gmenu.FLAGS_INCLUDE_NODISPLAY|gmenu.FLAGS_SHOW_ALL_SEPARATORS)
 		self.settings.visible_tree = gmenu.lookup_tree('settings.menu') 	 
 		self.settings.path = os.path.join(util.getUserMenuPath(), self.settings.tree.get_menu_file()) 	 
 		if not os.path.isfile(self.settings.path): 	 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jan 19 16:41:17 2009
@@ -21,7 +21,7 @@
 
 AM_PATH_PYTHON_VERSION(2.6, 2.6.0, 2.5, 2.5.0, 2.4, 2.4.0)
 
-PKG_CHECK_MODULES(ALACARTE, libgnome-menu >= 2.15)
+PKG_CHECK_MODULES(ALACARTE, libgnome-menu >= 2.22.2)
 
 dnl Check for correctly installed pygobject
 AC_MSG_CHECKING(for pygobject required_pygobject_version installed for python required_python_abi)