From e6e6e253c14f4b026ecc903b8efd847edbd3eb45 Mon Sep 17 00:00:00 2001
From: bg66 <bg66>
Date: Thu, 14 Dec 2006 09:56:32 +0000
Subject: [PATCH] * mixi.el (mixi-object-title): Remove application dependant
 codes. (mixi-object-content): Ditto.

* sb-mixi.el (shimbun-mixi-make-subject): Follow the change above.
(shimbun-mixi-make-body): Ditto.
---
 ChangeLog  |    8 ++++++++
 mixi.el    |   33 ++++++---------------------------
 sb-mixi.el |   20 +++++++++++++++++++-
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 341783b..5100728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-12-14  OHASHI Akira  <bg66@koka-in.org>
 
+	* mixi.el (mixi-object-title): Remove application dependant codes.
+	(mixi-object-content): Ditto.
+
+	* sb-mixi.el (shimbun-mixi-make-subject): Follow the change above.
+	(shimbun-mixi-make-body): Ditto.
+
+2006-12-14  OHASHI Akira  <bg66@koka-in.org>
+
 	* mixi.el (mixi-friend-nick-regexp): Follow the change of mixi.
 	(mixi-friend-realize): Ditto.
 
diff --git a/mixi.el b/mixi.el
index 266e4b5..7f4a1d1 100644
--- a/mixi.el
+++ b/mixi.el
@@ -480,38 +480,17 @@ Increase this value when unexpected error frequently occurs."
   "Return the title of OBJECT."
   (unless (mixi-object-p object)
     (signal 'wrong-type-argument (list 'mixi-object-p object)))
-  (let ((class (mixi-object-class object))
-	(func (intern (concat mixi-object-prefix
-			      (mixi-object-name object) "-title")))
-	prefix)
-    (cond ((eq class 'mixi-event)
-	   (setq prefix "[¥¤¥Ù¥ó¥È]")))
-    (concat prefix (funcall func object))))
+  (let ((func (intern (concat mixi-object-prefix
+			      (mixi-object-name object) "-title"))))
+    (funcall func object)))
 
 (defun mixi-object-content (object)
   "Return the content of OBJECT."
   (unless (mixi-object-p object)
     (signal 'wrong-type-argument (list 'mixi-object-p object)))
-  (let ((class (mixi-object-class object)))
-    (cond ((eq class 'mixi-event)
-	   (let ((limit (mixi-event-limit object)))
-	     (setq limit (if limit
-			     (format-time-string "%Yǯ%m·î%dÆü" limit)
-			   "»ØÄê¤Ê¤·"))
-	     (concat "<dl><dt>³«ºÅÆü»þ¡§</dt>"
-		     "<dd>" (mixi-event-date object) "</dd>"
-		     "<dt>³«ºÅ¾ì½ê¡§</dt>"
-		     "<dd>" (mixi-event-place object) "</dd>"
-		     "<dt>¾ÜºÙ¡§</dt>"
-		     "<dd>" (mixi-event-detail object) "</dd>"
-		     "<dt>Ê罸´ü¸Â¡§</dt>"
-		     "<dd>" limit "</dd>"
-		     "<dt>»²²Ã¼Ô¡§</dt>"
-		     "<dd>" (mixi-event-members object) "</dd></dl>")))
-	  (t
-	   (let ((func (intern (concat mixi-object-prefix
-				       (mixi-object-name object) "-content"))))
-	     (funcall func object))))))
+  (let ((func (intern (concat mixi-object-prefix
+			      (mixi-object-name object) "-content"))))
+    (funcall func object)))
 
 (defun mixi-object-set-timestamp (object timestamp)
   "Set the timestamp of OBJECT."
diff --git a/sb-mixi.el b/sb-mixi.el
index ef388d5..3e4dfe4 100644
--- a/sb-mixi.el
+++ b/sb-mixi.el
@@ -99,6 +99,8 @@ of mixi object."
     (cond ((eq class 'mixi-comment)
 	   (concat "Re: " (shimbun-mixi-make-subject
 			   (mixi-comment-parent object))))
+	  ((eq class 'mixi-event)
+	   (concat "[¥¤¥Ù¥ó¥È] " (mixi-event-title object)))
 	  (t (mixi-object-title object)))))
 
 (defun shimbun-mixi-make-from (object)
@@ -144,7 +146,23 @@ of mixi object."
 	   (mixi-expand-url (mixi-message-page object))))))
 
 (defun shimbun-mixi-make-body (object)
-  (mixi-object-content object))
+  (let ((class (mixi-object-class object)))
+    (cond ((eq class 'mixi-event)
+	   (let ((limit (mixi-event-limit object)))
+	     (setq limit (if limit
+			     (format-time-string "%Yǯ%m·î%dÆü" limit)
+			   "»ØÄê¤Ê¤·"))
+	     (concat "<dl><dt>³«ºÅÆü»þ¡§</dt>"
+		     "<dd>" (mixi-event-date object) "</dd>"
+		     "<dt>³«ºÅ¾ì½ê¡§</dt>"
+		     "<dd>" (mixi-event-place object) "</dd>"
+		     "<dt>¾ÜºÙ¡§</dt>"
+		     "<dd>" (mixi-event-detail object) "</dd>"
+		     "<dt>Ê罸´ü¸Â¡§</dt>"
+		     "<dd>" limit "</dd>"
+		     "<dt>»²²Ã¼Ô¡§</dt>"
+		     "<dd>" (mixi-event-members object) "</dd></dl>")))
+	  (t (mixi-object-content object)))))
 
 (defun shimbun-mixi-get-headers (shimbun objects &optional range)
   (when objects
-- 
1.7.10.4