X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=package%2Fsrc%2Forg%2Fmaemo%2Fhermes%2Fengine%2Ffriend.py;h=3022f1186d97ef0d3e435e59bb8845b8f7e0c2a1;hb=5e6ad605b54061576512ece44c3bf87d169b789c;hp=74f96dacae6a103f6b02f0dfd78f2ac963dae294;hpb=8cba4541d7533bcbe0eee9b7822c09fc53e66e1a;p=hermes

diff --git a/package/src/org/maemo/hermes/engine/friend.py b/package/src/org/maemo/hermes/engine/friend.py
index 74f96da..3022f11 100644
--- a/package/src/org/maemo/hermes/engine/friend.py
+++ b/package/src/org/maemo/hermes/engine/friend.py
@@ -75,7 +75,7 @@ class Friend():
     def set_photo_url(self, url):
         self._set('photo-url', url)
     
-    def update_friend(self, other_friend, overwrite=False):
+    def update_from_friend(self, other_friend, overwrite=False):
         """
         Overwrites any attributes in this friend, with attributes from other_friend
         """