Merge branch 'master' of git@wendt.se:hermes

[hermes] / package / src / org / maemo / hermes / engine / friend.py

diff --git a/package/src/org/maemo/hermes/engine/friend.py b/package/src/org/maemo/hermes/engine/friend.py
index 74f96da..3022f11 100644 (file)
--- 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
         """