sup

commit 28ed14d7ed3c8fff5e24966157ef877c02d189fe
parent 8ee91effe23a42d483fa6c0d2106ff328d3ba686
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Mon, 27 Jul 2009 13:18:40 -0400

Merge branch 'master' into next

Diffstat:

1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/sup/modes/edit-message-mode.rb b/lib/sup/modes/edit-message-mode.rb
@@ -73,7 +73,14 @@ EOS
       @attachment_names = []
     end
 
-    @message_id = "<#{Time.now.to_i}-sup-#{rand 10000}@#{Socket.gethostname}>"
+    begin
+      hostname = File.open("/etc/mailname", "r").gets.chomp
+    rescue
+        nil
+    end
+    hostname = Socket.gethostname if hostname.nil? or hostname.empty?
+
+    @message_id = "<#{Time.now.to_i}-sup-#{rand 10000}@#{hostname}>"
     @edited = false
     @selectors = []
     @selector_label_width = 0