Merge branch 'hook-local-vars'

[sup] / lib / sup / contact.rb

diff --git a/lib/sup/contact.rb b/lib/sup/contact.rb
index 8050c067235668821aabb053b413d83b4f5015b0..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
@@ -51,7 +49,7 @@ class ContactManager
 
   def save
     File.open(@fn, "w") do |f|
-      @p2a.each do |p, a|
+      @p2a.sort_by { |(p, a)| [p.full_address, a] }.each do |(p, a)|
         f.puts "#{a || ''}: #{p.full_address}"
       end
     end