Merge branch 'master' of git://dev.laptop.org/sugar
This commit is contained in:
commit
f428b3ab74
@ -65,7 +65,8 @@ class ActivitiesBox(hippo.CanvasBox):
|
|||||||
self.add_activity(activity)
|
self.add_activity(activity)
|
||||||
|
|
||||||
for bundle in self._shell_model.get_bundle_registry():
|
for bundle in self._shell_model.get_bundle_registry():
|
||||||
self.add_activity(bundle)
|
if bundle.get_show_launcher():
|
||||||
|
self.add_activity(bundle)
|
||||||
|
|
||||||
for invite in self._invites:
|
for invite in self._invites:
|
||||||
self.add_invite(invite)
|
self.add_invite(invite)
|
||||||
|
Loading…
Reference in New Issue
Block a user