Merge branch 'xapian-updates'

[sup] / lib / sup / contact.rb

diff --git a/lib/sup/contact.rb b/lib/sup/contact.rb
index b0c272e8ece056b825ede520312f49d35de7d23c..c489aaff5a4d67ce9d7156a10013f329bf790f11 100644 (file)
--- a/lib/sup/contact.rb
+++ b/lib/sup/contact.rb
@@ -17,13 +17,11 @@ class ContactManager
       IO.foreach(fn) do |l|
         l =~ /^([^:]*): (.*)$/ or raise "can't parse #{fn} line #{l.inspect}"
         aalias, addr = $1, $2
-        p = PersonManager.person_for addr, :definitive => true
+        p = Person.from_address addr
         @p2a[p] = aalias
         @a2p[aalias] = p unless aalias.nil? || aalias.empty?
       end
     end
-
-    self.class.i_am_the_instance self
   end
 
   def contacts; @p2a.keys end