Ticket #4157: 0003-Collaboration-fix-invite-notification-and-buddy-pale.patch

File 0003-Collaboration-fix-invite-notification-and-buddy-pale.patch, 2.2 KB (added by manuq, 11 years ago)

Shell patch.

  • src/jarabe/frame/notification.py 

    From a2df0fddd32ca298e394c804fe60d3e2332b66ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Tue, 6 Nov 2012 01:20:18 -0300
Subject: [PATCH artwork 3/3] Collaboration: fix invite notification and buddy
 palette - SL #4157
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>

- 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>
---
 src/jarabe/frame/notification.py | 2 +-
 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 b class NotificationWindow(Gtk.Window): 
    9797
    9898    def _realize_cb(self, widget):
    9999        self.set_type_hint(Gdk.WindowTypeHint.DIALOG)
    100         self.window.set_accept_focus(False)
     100        self.get_window().set_accept_focus(False)
    101101
    102102        color = Gdk.color_parse(style.COLOR_TOOLBAR_GREY.get_html())
    103103        self.modify_bg(Gtk.StateType.NORMAL, color)

  • src/jarabe/view/buddymenu.py 

    diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index f1cc533..2579d96 100644
    a b class BuddyMenu(Palette): 
    6767        self._buddy.disconnect_by_func(self.__buddy_notify_nick_cb)
    6868
    6969    def _add_buddy_items(self):
     70        menu_item = None
    7071        if friends.get_model().has_buddy(self._buddy):
    7172            menu_item = PaletteMenuItem(_('Remove friend'), 'list-remove')
    7273            menu_item.connect('activate', self._remove_friend_cb)
    … … class BuddyMenu(Palette): 
    7475            menu_item = PaletteMenuItem(_('Make friend'), 'list-add')
    7576            menu_item.connect('activate', self._make_friend_cb)
    7677
    77         self.menu_box.pack_start(menu_box, True, True, 0)
     78        self.menu_box.pack_start(menu_item, True, True, 0)
    7879
    7980        self._invite_menu = PaletteMenuItem('')
    8081        self._invite_menu.connect('activate', self._invite_friend_cb)