Fixed bug 839 (don't add self again)

Detailed changes:
> 	Fix bug 839:
> 	* commands1.el (kom-add-self): Don't re-add self.
>

src/ChangeLog

 2003-03-16  David Byers  <david.byers@swipnet.se>
 
+	Fix bug 839:
+	* commands1.el (kom-add-self): Don't re-add self.
+
 	Fix bug 854:
 	* commands2.el (kom-join-all-conferences): New command.
 	(kom-leave-all-conferences): New command.

src/commands1.el

@@ -578,39 +578,38 @@ See `kom-membership-default-priority' and
   (let* ((whereto (if conf (blocking-do 'get-conf-stat conf)
                     (lyskom-read-conf-stat 
                      (lyskom-get-string 'where-to-add-self)
-                     '(all) nil "" t)))
-         (who (blocking-do 'get-conf-stat lyskom-pers-no))
-         (pers-stat (blocking-do 'get-pers-stat lyskom-pers-no))
-         (mship (lyskom-get-membership (conf-stat->conf-no whereto) t))
-         (no-of-unread
-          (unless (and mship (not (membership-type->passive
-                                   (membership->type mship))))
-            (lyskom-read-num-range-or-date 
-             0 
-             (conf-stat->no-of-texts whereto)
-             (lyskom-format 'initial-unread)
-             nil
-             t
-             nil))))
-
-    ;; Fake kom-membership-default-priority if this is a passive membership
-    ;; This will suppress the normal "which priority" question. Ugly hack.
-
-    (let ((kom-membership-default-priority
-           (if (and mship (membership-type->passive (membership->type mship)))
-               (membership->priority mship)
-             kom-membership-default-priority)))
-
-      (lyskom-add-member-answer (lyskom-try-add-member whereto
-                                                       who
-                                                       pers-stat
-                                                       nil
-                                                       nil
-                                                       t
-                                                       nil
-                                                       no-of-unread)
-                                whereto who
-                                no-of-unread))))
+                     '(all) nil "" t))))
+    (if (lyskom-is-member (conf-stat->conf-no whereto)
+                          lyskom-pers-no)
+        (lyskom-format-insert 'you-already-member whereto)
+      (let* ((who (blocking-do 'get-conf-stat lyskom-pers-no))
+             (pers-stat (blocking-do 'get-pers-stat lyskom-pers-no))
+             (mship (lyskom-get-membership (conf-stat->conf-no whereto) t))
+             (no-of-unread
+              (unless (and mship (not (membership-type->passive
+                                       (membership->type mship))))
+                (lyskom-read-num-range-or-date 
+                 0 
+                 (conf-stat->no-of-texts whereto)
+                 (lyskom-format 'initial-unread)
+                 nil
+                 t
+                 nil)))
+             (kom-membership-default-priority
+              (if (and mship (membership-type->passive (membership->type mship)))
+                  (membership->priority mship)
+                kom-membership-default-priority)))
+
+        (lyskom-add-member-answer (lyskom-try-add-member whereto
+                                                         who
+                                                         pers-stat
+                                                         nil
+                                                         nil
+                                                         t
+                                                         nil
+                                                         no-of-unread)
+                                  whereto who
+                                  no-of-unread)))))
 
 
 (def-kom-command kom-change-priority (&optional conf)

src/english-strings.el

@@ -294,6 +294,7 @@ instead of removing it.")
     (cancelled . "cancelled.\n")
     (nope . "didn't work.\n")
     (add-already-member . "%#1P is already a member of %#2M.\n")
+    (you-already-member . "You are already a member of %#1M.\n")
 
     (cant-find-supervisor . "Can't find supervisor of %#1M.\n")
     (is-read-protected-contact-supervisor . "%#1M is closed.

src/swedish-strings.el

@@ -290,6 +290,7 @@ f
     (cancelled . "avbrutet.\n")
     (nope . "det gick inte.\n")
     (add-already-member . "%#1P r redan medlem i %#2M.\n")
+    (you-already-member . "Du r redan medlem i %#1M.\n")
 
     (cant-find-supervisor . "Hittar inte organisatren fr %#1M.\n")
     (is-read-protected-contact-supervisor . "%#1M r slutet.