Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-05 12:03:38 +02:00
Code Issues Projects Releases Wiki Activity

Fix problem with plugin registration. If a plugin disappears without being correctly removed, then building the current action set threw an exception. The only way around it was to hack the preferences. The fix simply ignores missing actions.

Browse source
This commit is contained in:
Charles Haley 2011-01-12 11:13:14 +00:00
parent bf183471ea
commit b09b3fc993
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/calibre/gui2/preferences/toolbar.py
View file

@ -37,7 +37,10 @@ def name_to_action(self, name, gui):
dont_remove_from=set(['toolbar-device']))
if name is None:
return FakeAction('--- '+_('Separator')+' ---', None)
return gui.iactions[name]
try:
return gui.iactions[name]
except:
return None
def rowCount(self, parent):
return len(self._data)
@ -124,7 +127,8 @@ def __init__(self, key, gui):
BaseModel.__init__(self)
self.gprefs_name = 'action-layout-'+key
current = gprefs[self.gprefs_name]
self._data = [self.name_to_action(x, gui) for x in current]
self._data = [self.name_to_action(x, gui) for x in current]
self._data = [x for x in self._data if x is not None]
self.key = key
self.gui = gui