From f9012b88f60f8e4ac96cb55aea763edc74ad586e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 21 Sep 2006 13:52:17 -0400 Subject: [PATCH] Move remove code down to fix undefined var error --- shell/view/BuddyIcon.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/shell/view/BuddyIcon.py b/shell/view/BuddyIcon.py index 0cf90feb..607dec65 100644 --- a/shell/view/BuddyIcon.py +++ b/shell/view/BuddyIcon.py @@ -20,18 +20,17 @@ class BuddyIcon(MenuIcon): def _popup_action_cb(self, popup, action): self.popdown() - model = self._shell.get_model() - if action == BuddyMenu.ACTION_REMOVE_FRIEND: - friends = model.get_friends() - friends.remove(buddy) - buddy = self._friend.get_buddy() if buddy == None: return + model = self._shell.get_model() if action == BuddyMenu.ACTION_INVITE: activity = model.get_current_activity() activity.invite(buddy) elif action == BuddyMenu.ACTION_MAKE_FRIEND: friends = model.get_friends() friends.make_friend(buddy) + elif action == BuddyMenu.ACTION_REMOVE_FRIEND: + friends = model.get_friends() + friends.remove(buddy)