Added get_system_item_paths function to retrieve XDG_DATA_DIRS

Changed Logic in onPropsApp to iterate through all XDG_DATA_DIRS
Removed filecmp import
This commit is contained in:
Icius 2010-02-06 02:42:31 -05:00
parent 9551b3fb88
commit 1cbff0b2ed

View File

@ -12,7 +12,7 @@ import gettext
import gnomevfs
import threading
import commands
import filecmp
import subprocess
from easybuttons import *
from execute import Execute
@ -88,6 +88,15 @@ def get_user_item_path():
return item_dir
def get_system_item_paths():
item_dir = None
if os.environ.has_key('XDG_DATA_DIRS'):
item_dirs = os.environ['XDG_DATA_DIRS'].split(":")
else:
item_dirs = [os.path.join('usr', 'share')]
return item_dirs
def rel_path(target, base=os.curdir):
@ -763,9 +772,15 @@ class pluginclass( object ):
def onPropsApp( self, menu, widget ):
relPath = rel_path(widget.desktopFile, "/usr/share/applications")
sysPaths = get_system_item_paths()
if widget.desktopFile == os.path.join("/usr/share/applications" , relPath):
for path in sysPaths:
path += "applications"
relPath = os.path.relpath(widget.desktopFile, path)
if widget.desktopFile == os.path.join(path, relPath):
filePath = os.path.join(get_user_item_path(), relPath)
(head,tail) = os.path.split(filePath)
@ -775,11 +790,12 @@ class pluginclass( object ):
if not os.path.isfile(filePath):
data = open(widget.desktopFile).read()
open(filePath, 'w').write(data)
break
else:
filePath = widget.desktopFile
pid = os.spawnlp(os.P_NOWAIT, "/usr/bin/gnome-desktop-item-edit", "gnome-desktop-item-edit", filePath)
pid = subprocess.Popen(["/usr/bin/gnome-desktop-item-edit", filePath]).pid
self.mintMenuWin.hide()