diff options
| author | Santiago Rodriguez <santi@trisquel.info> | 2012-10-22 16:03:42 (GMT) |
|---|---|---|
| committer | Santiago Rodriguez <santi@trisquel.info> | 2012-10-22 16:03:42 (GMT) |
| commit | 21fcd272cd3d3aac300b0ab70b6484b8438de7a5 (patch) | |
| tree | 2102df16d035e2bb67f32a127e59cab49cd12837 | |
| parent | 2af4af56e3f8efd5fa9289ba9faf4e5b7214ff81 (diff) | |
Solved conflict
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 0dac4c0..0c5e202 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -632,6 +632,10 @@ class OwnerIcon(BuddyIcon): palette.menu.append(self._register_menu) self._register_menu.show() + self.connect_to_palette_pop_events(palette) + + return palette + def __register_activate_cb(self, menuitem): self.emit('register-activate') |