--- a/hooks/email.py	Fri Aug 14 12:14:29 2009 +0200
+++ b/hooks/email.py	Fri Aug 14 14:23:21 2009 +0200
@@ -42,7 +42,7 @@
     category = 'email'
     events = ('after_add_relation',)
 
-    def call(self, session, eidfrom, rtype, eidto):
+    def __call__(self):
         entity = self.cw_req.entity_from_eid(self.eidfrom)
         if 'primary_email' in entity.e_schema.subject_relations():
             SetPrimaryEmailRelationOp(self.cw_req, entity=entity,

--- a/vregistry.py	Fri Aug 14 12:14:29 2009 +0200
+++ b/vregistry.py	Fri Aug 14 14:23:21 2009 +0200
@@ -314,8 +314,8 @@
         except AttributeError:
             vname = obj.__class__.__name__
         self.debug('registered appobject %s in registry %s with id %s',
-                   vname, registryname, oid or obj.id)
-        self._loadedmods[obj.__module__]['%s.%s' % (obj.__module__, oid)] = obj
+                   vname, registryname, oid or class_regid(obj))
+        self._loadedmods[obj.__module__][classid(obj)] = obj
 
     def unregister(self, obj, registryname=None):
         self[registryname or obj.__registry__].unregister(obj)
@@ -404,10 +404,10 @@
                 return
         except TypeError:
             return
-        objname = '%s.%s' % (modname, obj.__name__)
-        if objname in self._loadedmods[modname]:
+        clsid = classid(obj)
+        if clsid in self._loadedmods[modname]:
             return
-        self._loadedmods[modname][objname] = obj
+        self._loadedmods[modname][clsid] = obj
         for parent in obj.__bases__:
             self._load_ancestors_then_object(modname, parent)
         self.load_object(obj)