From: bg66 <bg66>
Date: Mon, 12 Mar 2007 02:12:17 +0000 (+0000)
Subject: * mixi.el (mixi-login): Simplify.
X-Git-Tag: mixi-el-1_0_0~57
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f09e1c6a40f43817169f2fe780f5461eed3858fa;p=elisp%2Fmixi.git

* mixi.el (mixi-login): Simplify.
---

diff --git a/ChangeLog b/ChangeLog
index 0a4335b..0d89dd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-12  OHASHI Akira  <bg66@koka-in.org>
+
+	* mixi.el (mixi-login): Simplify.
+
 2007-03-07  OHASHI Akira  <bg66@koka-in.org>
 
 	* riece-mixi.el (riece-mixi-display-message-function): Simplify.
diff --git a/mixi.el b/mixi.el
index 835905f..d7f00d1 100644
--- a/mixi.el
+++ b/mixi.el
@@ -415,9 +415,9 @@ Increase this value when unexpected error frequently occurs."
 		   (read-from-minibuffer (mixi-message "Login Email: "))))
 	(password (or password mixi-default-password
 		      (read-passwd (mixi-message "Login Password: ")))))
-    (let ((url "/login.pl"))
-      (when mixi-login-use-ssl
-	(setq url (concat "https://mixi.jp" url)))
+    (let ((url (mixi-expand-url "/login.pl")))
+      (when (and mixi-login-use-ssl (string-match "^http:" url))
+	(setq url (replace-match "https:" nil nil url)))
       (let ((buffer (mixi-retrieve url
 				   (concat "email=" email
 					   "&password=" password