diff options
| author | Manuel Quiñones <manuq@laptop.org> | 2012-11-06 04:20:18 (GMT) |
|---|---|---|
| committer | Manuel Quiñones <manuq@laptop.org> | 2012-11-06 12:55:31 (GMT) |
| commit | 6e747b5887c1764b864e2b40b13a63c3577418ef (patch) | |
| tree | 0dff9dc10863221451d6aa2000b3268748fe6e75 | |
| parent | 71ff031d2c54f46adace7cde04ab821ec600a762 (diff) | |
Collaboration: fix invite notification and buddy palette - SL #4157
- Buddy Palette: fix typo in variable name
- .window -> get_window() API change, made sure this is the last one
from shell and toolkit
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
| -rw-r--r-- | src/jarabe/frame/notification.py | 2 | ||||
| -rw-r--r-- | src/jarabe/view/buddymenu.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/jarabe/frame/notification.py b/src/jarabe/frame/notification.py index 184a779..f63964f 100644 --- a/src/jarabe/frame/notification.py +++ b/src/jarabe/frame/notification.py @@ -97,7 +97,7 @@ class NotificationWindow(Gtk.Window): def _realize_cb(self, widget): self.set_type_hint(Gdk.WindowTypeHint.DIALOG) - self.window.set_accept_focus(False) + self.get_window().set_accept_focus(False) color = Gdk.color_parse(style.COLOR_TOOLBAR_GREY.get_html()) self.modify_bg(Gtk.StateType.NORMAL, color) diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py index f1cc533..2579d96 100644 --- a/src/jarabe/view/buddymenu.py +++ b/src/jarabe/view/buddymenu.py @@ -67,6 +67,7 @@ class BuddyMenu(Palette): self._buddy.disconnect_by_func(self.__buddy_notify_nick_cb) def _add_buddy_items(self): + menu_item = None if friends.get_model().has_buddy(self._buddy): menu_item = PaletteMenuItem(_('Remove friend'), 'list-remove') menu_item.connect('activate', self._remove_friend_cb) @@ -74,7 +75,7 @@ class BuddyMenu(Palette): menu_item = PaletteMenuItem(_('Make friend'), 'list-add') menu_item.connect('activate', self._make_friend_cb) - self.menu_box.pack_start(menu_box, True, True, 0) + self.menu_box.pack_start(menu_item, True, True, 0) self._invite_menu = PaletteMenuItem('') self._invite_menu.connect('activate', self._invite_friend_cb) |