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

Fix crash on non-existing favorites

Browse Source 
Corner case when rebuilding favs from scratch
This commit is contained in:
Clement Lefebvre 2019-07-21 16:52:46 +02:00
parent 89f9071bd4
commit 3ad195599b
1 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1223,20 +1223,13 @@ class pluginclass(object):
# For Folders and Network Shares # For Folders and Network Shares
location = "".join(location.split("%20")) location = "".join(location.split("%20"))
# TODO: Do we still need this?
#For Special locations
if location == "x-nautilus-desktop:///computer":
location = "/usr/share/applications/nautilus-computer.desktop"
elif location == "x-nautilus-desktop:///home":
location = "/usr/share/applications/nautilus-home.desktop"
elif location == "x-nautilus-desktop:///network":
location = "/usr/share/applications/network-scheme.desktop"
elif location.startswith("x-nautilus-desktop:///"):
location = "/usr/share/applications/nautilus-computer.desktop"
if location.startswith("file://"): if location.startswith("file://"):
location = location[7:] location = location[7:]
if not os.path.exists(location):
print("%s does not exist, skipping." % location)
return None
# Don't add a location twice # Don't add a location twice
for fav in self.favorites: for fav in self.favorites:
if fav.type == "location" and fav.desktopFile == location: if fav.type == "location" and fav.desktopFile == location:
@ -1277,33 +1270,37 @@ class pluginclass(object):
position = 0 position = 0
for app in applicationsList : for app in applicationsList:
app = app.strip() try:
app = app.strip()
if app[0:9] == "location:": if app[0:9] == "location:":
favButton = self.favoritesBuildLauncher(app[9:]) favButton = self.favoritesBuildLauncher(app[9:])
elif app == "space": elif app == "space":
favButton = self.favoritesBuildSpace() favButton = self.favoritesBuildSpace()
elif app == "separator": elif app == "separator":
favButton = self.favoritesBuildSeparator() favButton = self.favoritesBuildSeparator()
else:
if app.endswith(".desktop"):
favButton = self.favoritesBuildLauncher(app)
else: else:
favButton = None if app.endswith(".desktop"):
favButton = self.favoritesBuildLauncher(app)
else:
favButton = None
if favButton: if favButton:
favButton.position = position favButton.position = position
self.favorites.append(favButton) self.favorites.append(favButton)
self.favoritesPositionOnGrid(favButton) self.favoritesPositionOnGrid(favButton)
favButton.drag_source_set(Gdk.ModifierType.BUTTON1_MASK, self.toFav, Gdk.DragAction.COPY) favButton.drag_source_set(Gdk.ModifierType.BUTTON1_MASK, self.toFav, Gdk.DragAction.COPY)
favButton.drag_dest_set(Gtk.DestDefaults.MOTION | favButton.drag_dest_set(Gtk.DestDefaults.MOTION |
Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.HIGHLIGHT |
Gtk.DestDefaults.DROP, Gtk.DestDefaults.DROP,
self.toFav, Gdk.DragAction.COPY) self.toFav, Gdk.DragAction.COPY)
favButton.connect("drag-data-get", self.on_drag_data_get) favButton.connect("drag-data-get", self.on_drag_data_get)
favButton.connect("drag-data-received", self.on_drag_data_received) favButton.connect("drag-data-received", self.on_drag_data_received)
position += 1 position += 1
except Exception as e:
print("Can't add favorite: %s" % app)
print (e)
self.favoritesSave() self.favoritesSave()
except Exception as e: except Exception as e: