Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-10-19 10:55:25 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-10-19 10:55:25 (GMT)
commit3d3ef947e10e5d5fc2b6656bd299a42cc17f9615 (patch)
tree71facb0eff41fdf25ef0804b80aeba59b2ff1181 /shell
parentfafa1ae35ed73141131e445f4a883d71f9ef278d (diff)
Fix method naming conflict
Diffstat (limited to 'shell')
-rw-r--r--shell/view/frame/FriendsBox.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/shell/view/frame/FriendsBox.py b/shell/view/frame/FriendsBox.py
index 92e66b6..57e9528 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)