jbah.skp/mintmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commented some old xdg code

Browse Source
This commit is contained in:
Clement Lefebvre 2009-11-19 09:05:28 +00:00
parent 932ada9c48
commit 8bdf2ee117
2 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
mintmenu (4.8.7) helena; urgency=low
* Replaced xdg with gmenu (Fixes broken Games category)
* Removed calls to mouse grabs (Could fix weird bug about not being able to grab the mouse)
-- Clement Lefebvre <root@linuxmint.com> Thu, 19 Nov 2009 08:52:00 +0000
mintmenu (4.8.6) helena; urgency=low mintmenu (4.8.6) helena; urgency=low
* Fixed missing i18n * Fixed missing i18n

92
usr/lib/linuxmint/mintMenu/plugins/applications.py
View File

@ -20,58 +20,58 @@ from easyfiles import *
from filemonitor import monitor as filemonitor from filemonitor import monitor as filemonitor
import xdg.Menu #import xdg.Menu
import gmenu import gmenu
# i18n # i18n
gettext.install("mintmenu", "/usr/share/linuxmint/locale") gettext.install("mintmenu", "/usr/share/linuxmint/locale")
# Evil patching # Evil patching
def xdgParsePatched(filename=None): #def xdgParsePatched(filename=None):
# conver to absolute path # # conver to absolute path
if filename and not os.path.isabs(filename): # if filename and not os.path.isabs(filename):
filename = xdg.Menu.__getFileName(filename) # filename = xdg.Menu.__getFileName(filename)
#
# use default if no filename given # # use default if no filename given
if not filename: # if not filename:
filename = xdg.Menu.__getFileName("applications.menu") # filename = xdg.Menu.__getFileName("applications.menu")
#
if not filename: # if not filename:
raise xdg.Menu.ParsingError(_("File not found"), "/etc/xdg/menus/applications.menu") # raise xdg.Menu.ParsingError(_("File not found"), "/etc/xdg/menus/applications.menu")
#
# check if it is a .menu file # # check if it is a .menu file
if not os.path.splitext(filename)[1] == ".menu": # if not os.path.splitext(filename)[1] == ".menu":
raise xdg.Menu.ParsingError(_("Not a .menu file"), filename) # raise xdg.Menu.ParsingError(_("Not a .menu file"), filename)
#
# create xml parser # # create xml parser
try: # try:
doc = xdg.Menu.xml.dom.minidom.parse(filename) # doc = xdg.Menu.xml.dom.minidom.parse(filename)
except xdg.Menu.xml.parsers.expat.ExpatError: # except xdg.Menu.xml.parsers.expat.ExpatError:
raise xdg.Menu.ParsingError(_("Not a valid .menu file"), filename) # raise xdg.Menu.ParsingError(_("Not a valid .menu file"), filename)
#
# parse menufile # # parse menufile
xdg.Menu.tmp["Root"] = "" # xdg.Menu.tmp["Root"] = ""
xdg.Menu.tmp["mergeFiles"] = [] # xdg.Menu.tmp["mergeFiles"] = []
xdg.Menu.tmp["DirectoryDirs"] = [] # xdg.Menu.tmp["DirectoryDirs"] = []
xdg.Menu.tmp["cache"] = xdg.Menu.MenuEntryCache() # xdg.Menu.tmp["cache"] = xdg.Menu.MenuEntryCache()
#
xdg.Menu.__parse(doc, filename, xdg.Menu.tmp["Root"]) # xdg.Menu.__parse(doc, filename, xdg.Menu.tmp["Root"])
xdg.Menu.__parsemove(xdg.Menu.tmp["Root"]) # xdg.Menu.__parsemove(xdg.Menu.tmp["Root"])
xdg.Menu.__postparse(xdg.Menu.tmp["Root"]) # xdg.Menu.__postparse(xdg.Menu.tmp["Root"])
#
xdg.Menu.tmp["Root"].Doc = doc # xdg.Menu.tmp["Root"].Doc = doc
xdg.Menu.tmp["Root"].Filename = filename # xdg.Menu.tmp["Root"].Filename = filename
#
# generate the menu # # generate the menu
xdg.Menu.__genmenuNotOnlyAllocated(xdg.Menu.tmp["Root"]) # xdg.Menu.__genmenuNotOnlyAllocated(xdg.Menu.tmp["Root"])
xdg.Menu.__genmenuOnlyAllocated(xdg.Menu.tmp["Root"]) # xdg.Menu.__genmenuOnlyAllocated(xdg.Menu.tmp["Root"])
#
# and finally sort # # and finally sort
xdg.Menu.sort(xdg.Menu.tmp["Root"]) # xdg.Menu.sort(xdg.Menu.tmp["Root"])
xdg.Menu.tmp["Root"].Files = xdg.Menu.tmp["mergeFiles"] + [ xdg.Menu.tmp["Root"].Filename ] # xdg.Menu.tmp["Root"].Files = xdg.Menu.tmp["mergeFiles"] + [ xdg.Menu.tmp["Root"].Filename ]
return xdg.Menu.tmp["Root"] # return xdg.Menu.tmp["Root"]
#
xdg.Menu.parse = xdgParsePatched #xdg.Menu.parse = xdgParsePatched
class Menu: class Menu:
def __init__( self, MenuToLookup ): def __init__( self, MenuToLookup ):