[PATCH] Avoid opening secondary select methods as foreign servers

[asjo@koldfront.dk (Adam Sjøgren)]

This is probably the wrong way to fix the problem - which is that
Gnus opens servers defined in secondary-select-methods twice, once
with all the configuration given and once as a foreign server with
none of the configuration given.

The easy way to see the symptom is to go to the *Server* buffer where
servers will be listed twice, or to check the value of the
gnus-opened-servers variable, which holds the same server twice.

This patch changes gnus-secondary-select-method-p to only look at
the first two elements in the list (nntp and "news.server.org"),
because the incoming argument never has the entire list.

gnus-check-server is then changed to call gnus-secondary-select-method-p
and if the server in question is in secondary-select-methods, the
configuration from there is used.
---
 lisp/gnus-int.el |    3 +++
 lisp/gnus.el     |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index a079591..94fb6c7 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -169,6 +169,9 @@ If it is down, start it up (again)."
     ;; Transform virtual server names into select methods.
     (when (stringp method)
       (setq method (gnus-server-to-method method)))
+    ;; Get configuration if the server is a secondary-select-method.
+    (when (gnus-secondary-method-p method)
+      (setq method (car (gnus-secondary-method-p method))))
     (if (gnus-server-opened method)
 	;; The stream is already opened.
 	t
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 281b9ab..c3a442a 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -3830,9 +3830,9 @@ You should probably use `gnus-find-method-for-group' instead."
   (let ((methods gnus-secondary-select-methods)
 	(gmethod (inline (gnus-server-get-method nil method))))
     (while (and methods
-		(not (gnus-method-equal
-		      (inline (gnus-server-get-method nil (car methods)))
-		      gmethod)))
+		(not (and
+                      (equal (caar methods)  (car gmethod))
+                      (equal (cadar methods) (cadr gmethod)))))
       (setq methods (cdr methods)))
     methods))
 
-- 
1.7.1


I am sure there are better solutions.

It is quite confusing to me how sometimes servers are referred to as
"nntp+news.server.org", sometimes as (nttp "news.server.org") and
sometimes as (nntp "news.server.org" (var 1) (var 2) ...).

Finding the correct place to fix the translation/comparison of these is
far from obvious to me.


  Best regards,

    Adam

-- 
 "My internal clock is on Tokyo time."                        Adam Sjøgren
                                                         asjo@koldfront.dk