* mixi.el (mixi-entity-alist): New constant.

[elisp/mixi.git] / mixi-gnus.el

diff --git a/mixi-gnus.el b/mixi-gnus.el
index 2397ddc..009dd21 100644 (file)
--- a/mixi-gnus.el
+++ b/mixi-gnus.el
@@ -34,19 +34,17 @@
 
 ;;; Code:
 
-(require 'sb-mixi)
+(require 'mixi-utils)
 (require 'message)
 
 (defun message-mixi-p ()
   "Say whether the current buffer contains a mixi message."
   (and (not message-this-is-news)
-       (or message-this-is-mail
-          (save-excursion
-            (save-restriction
-              (message-narrow-to-headers)
-              (or (message-fetch-field "mixi")
-                  (string-match shimbun-mixi-to-regexp
-                                (message-fetch-field "to"))))))))
+       (save-excursion
+        (save-restriction
+          (message-narrow-to-headers)
+          (or (message-fetch-field "mixi-to")
+              (string-match mixi-to-regexp (message-fetch-field "to")))))))
 
 (defun message-send-via-mixi (arg)
   "Send the current message via mixi."
@@ -56,8 +54,9 @@
     ;; Avoid matching with message-mail-p.
     (with-current-buffer mailbuf
       (goto-char (point-min))
-      (when (search-forward "\nTo: " nil t)
-       (replace-match "\nMixi: ")))
+      (unless (search-forward "\nMixi-To: " nil t)
+       (when (search-forward "\nTo: " nil t)
+         (replace-match "\nMixi-To: "))))
     (unwind-protect
        (save-excursion
          (set-buffer tembuf)
@@ -66,10 +65,10 @@
          (insert (with-current-buffer mailbuf
                    (mml-buffer-substring-no-properties-except-hard-newlines
                     (point-min) (point-max))))
-         (shimbun-mixi-send-mail (message-fetch-field "mixi")
-                                 (message-fetch-field "subject")
-                                 (buffer-substring (message-goto-body)
-                                                   (point-max))))
+         (mixi-send-mail (message-fetch-field "mixi-to")
+                         (message-fetch-field "subject")
+                         (buffer-substring (message-goto-body)
+                                           (point-max))))
       (kill-buffer tembuf))
     (set-buffer mailbuf)
     (push 'mixi message-sent-message-via)))
@@ -78,8 +77,7 @@
   (let ((method '(mixi message-mixi-p message-send-via-mixi)))
     (unless (member method message-send-method-alist)
       (setq message-send-method-alist
-           (cons '(mixi message-mixi-p message-send-via-mixi)
-                 message-send-method-alist)))))
+           (cons method message-send-method-alist)))))
 
 (provide 'mixi-gnus)