diff options
| author | Simon Schampijer <simon@laptop.org> | 2012-12-10 14:42:18 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@laptop.org> | 2012-12-10 17:37:45 (GMT) |
| commit | cb8b42ad069fbd067b4963c29993451b510b944d (patch) | |
| tree | 5bc9724c585f63c4fd27dd65248adee77c03c8af | |
| parent | 34fb1f8d948d0bc57334a7df94b8e1711f132912 (diff) | |
Adapt to PaletteMenu changes for popdown on item activation, SL #4191 and SL #4253
The toolkit now popdown the Palette when an
item is activated. We do not have to do it manually
any more.
The Control Panel item code was setting the panel
as transient on itself, this fails as the Palette
vanishes after the item is activated. We are doing
fine without setting the Control Panel transient on
the Palette, which is wrong in any case.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel Quiñones <manuq@laptop.org>
| -rw-r--r-- | extensions/deviceicon/frame.py | 1 | ||||
| -rw-r--r-- | src/jarabe/view/buddymenu.py | 1 | ||||
| -rw-r--r-- | src/jarabe/view/palettes.py | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/extensions/deviceicon/frame.py b/extensions/deviceicon/frame.py index cfc25bf..52e92ea 100644 --- a/extensions/deviceicon/frame.py +++ b/extensions/deviceicon/frame.py @@ -59,7 +59,6 @@ class DeviceView(TrayIcon): return palette def __button_release_event_cb(self, widget, event): - self.props.palette.popdown(immediate=True) self._input_method.show() frame = jarabe.frame.get_view() frame.hide() diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py index e38d215..5e38cb9 100644 --- a/src/jarabe/view/buddymenu.py +++ b/src/jarabe/view/buddymenu.py @@ -133,7 +133,6 @@ class BuddyMenu(Palette): # show the control panel panel = ControlPanel() - panel.set_transient_for(self._widget.get_toplevel()) panel.show() def _update_invite_menu(self, activity): diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py index cc15408..d61a250 100644 --- a/src/jarabe/view/palettes.py +++ b/src/jarabe/view/palettes.py @@ -163,7 +163,6 @@ class ActivityPalette(Palette): # TODO: start-with def __start_activate_cb(self, menu_item): - self.popdown(immediate=True) misc.launch(self._activity_info) @@ -271,7 +270,6 @@ class VolumePalette(Palette): self.connect('popup', self.__popup_cb) def __unmount_activate_cb(self, menu_item): - self.popdown(immediate=True) flags = 0 mount_operation = Gtk.MountOperation( \ parent=self.content_box.get_toplevel()) |