From 3d3ef947e10e5d5fc2b6656bd299a42cc17f9615 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 19 Oct 2006 12:55:25 +0200 Subject: [PATCH] Fix method naming conflict --- shell/view/frame/FriendsBox.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shell/view/frame/FriendsBox.py b/shell/view/frame/FriendsBox.py index 92e66b6d..57e9528f 100644 --- a/shell/view/frame/FriendsBox.py +++ b/shell/view/frame/FriendsBox.py @@ -39,7 +39,7 @@ class FriendsBox(hippo.CanvasBox): shell.connect('activity-changed', self.__activity_changed_cb) - def add(self, buddy): + def add_buddy(self, buddy): model = BuddyModel(buddy=buddy) icon = BuddyIcon(self._shell, self._menu_shell, model) style.apply_stylesheet(icon, 'frame.BuddyIcon') @@ -47,7 +47,7 @@ class FriendsBox(hippo.CanvasBox): self._buddies[buddy.get_name()] = icon - def remove(self, buddy): + def remove_buddy(self, buddy): self.remove(self._buddies[buddy.get_name()]) def clear(self): @@ -77,7 +77,7 @@ class FriendsBox(hippo.CanvasBox): if activity_ps != None: for buddy in activity_ps.get_joined_buddies(): - self.add(buddy) + self.add_buddy(buddy) self._joined_hid = activity_ps.connect( 'buddy-joined', self.__buddy_joined_cb) @@ -92,7 +92,7 @@ class FriendsBox(hippo.CanvasBox): self._set_activity_ps(None) def __buddy_joined_cb(self, activity, buddy): - self.add(buddy) + self.add_buddy(buddy) def __buddy_left_cb(self, activity, buddy): - self.remove(buddy) + self.remove_buddy(buddy)