Fixed order in gtk-bookmarks plugin. Fixed parsing filenames with spaces
This commit is contained in:
parent
b3df0f8725
commit
cefac7680a
@ -225,20 +225,23 @@ class pluginclass( object ):
|
|||||||
|
|
||||||
def do_gtk_bookmarks( self ):
|
def do_gtk_bookmarks( self ):
|
||||||
if self.showGTKBookmarks:
|
if self.showGTKBookmarks:
|
||||||
bookmarks = {}
|
bookmarks = []
|
||||||
with open(os.path.expanduser('~/.gtk-bookmarks'), 'r') as f:
|
with open(os.path.expanduser('~/.gtk-bookmarks'), 'r') as f:
|
||||||
for line in f:
|
for line in f:
|
||||||
#line = line.replace('file://', '')
|
#line = line.replace('file://', '')
|
||||||
line = line.rstrip()
|
line = line.rstrip()
|
||||||
parts = line.split(' ')
|
if not line:
|
||||||
|
continue
|
||||||
|
parts = line.split(' ', 1)
|
||||||
|
|
||||||
if len(parts) == 2:
|
if len(parts) == 2:
|
||||||
bookmarks[parts[1]] = parts[0]
|
path, name = parts
|
||||||
elif len(parts) == 1:
|
elif len(parts) == 1:
|
||||||
junk = os.path.split(parts[0])
|
path = parts[0]
|
||||||
bookmarks[junk[len(junk) - 1]] = parts[0]
|
name = os.path.basename(os.path.normpath(path))
|
||||||
|
bookmarks.append((name, path))
|
||||||
|
|
||||||
for name, path in bookmarks.iteritems():
|
for name, path in bookmarks:
|
||||||
name = unquote(name)
|
name = unquote(name)
|
||||||
currentbutton = easyButton( "folder", self.iconsize, [name], -1, -1 )
|
currentbutton = easyButton( "folder", self.iconsize, [name], -1, -1 )
|
||||||
currentbutton.connect( "clicked", self.launch_gtk_bookmark, path )
|
currentbutton.connect( "clicked", self.launch_gtk_bookmark, path )
|
||||||
|
Loading…
Reference in New Issue
Block a user