* elmo-nntp.el (elmo-nntp-folder-list-subfolders): Don't omit

server name in case with username.
(XXX: this is ad-hoc fix against username includes "@", it
should be solved fundamentally)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index b2dd936..4311b08 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-06  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * elmo-nntp.el (elmo-nntp-folder-list-subfolders): Don't omit
+       server name in case with username.
+       (XXX: this is ad-hoc fix against username includes "@", it
+       should be solved fundamentally)
+
 2003-07-05  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * elmo-nntp.el (elmo-nntp-debug): New function.

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 9fb54e2..6abe77f 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -586,8 +586,9 @@ Don't cache if nil.")
               (string= username elmo-nntp-default-user))
       (setq username nil))
 
-    (unless (string= (elmo-net-folder-server-internal folder)
-                    elmo-nntp-default-server)
+    (when (or username ; XXX: ad-hoc fix against username includes "@"
+             (not (string= (elmo-net-folder-server-internal folder)
+                           elmo-nntp-default-server)))
       (setq append-serv (concat "@" (elmo-net-folder-server-internal
                                     folder))))
     (unless (eq (elmo-net-folder-port-internal folder) elmo-nntp-default-port)