Commit e9e74ede authored by David Byers's avatar David Byers
Browse files

Fixed bug 302

Also fixed that declining an invitation would result in creating a passive
membership instead of completely unsubscribing.
parent 6e07c5fc
2002-04-10 David Byers <david.byers@swipnet.se>
* lyskom-rest.el (lyskom-check-go-to-conf): When we don't want to
accept an invitation, don't make the membership *passive*. That
causes all kinds of odd messages.
Better user interaction when an async-new-membership for an
invitation is seen:
* async.el (lyskom-async-new-membership): Print invitations
special.
We can usually have FAQs on persons too:
* commands1.el (kom-change-conf-faq): Can apply to persons too.
......
......@@ -307,12 +307,15 @@ this function shall be with current-buffer the BUFFER."
;; Are we already members?
(when membership
(let ((cur-mship (lyskom-try-get-membership conf-no t)))
(let ((cur-mship (lyskom-try-get-membership conf-no t))
(mship-type (membership->type membership)))
(unless cur-mship
(lyskom-format-insert-before-prompt
(if (membership-type->passive (membership->type membership))
'have-become-passive-member
'have-become-member)
(cond ((membership-type->invitation mship-type)
'have-become-invited-member)
((membership-type->passive mship-type)
'have-become-passive-member)
(t 'have-become-member))
conf-conf-stat))
(cond ((membership-type->passive (membership->type membership))
......
......@@ -955,6 +955,9 @@ for a text.
(no-longer-member . "You are no longer a member of %#1M.\n")
(no-longer-member-n . "You are no longer a member of %#1m (conference is gone).\n")
(have-become-member . "You have become a member of %#1M.\n")
(have-become-invited-member . "You have been invited to %#1M.
Go to the conference to accept or decline the invitation. You can also use
the command 'Join conference' to accept the invitation.\n")
(have-become-passive-member . "You have become a passive member of %#1M.\n")
......@@ -1673,7 +1676,7 @@ You must become an active member of the conference to enter it.\n")
(kom-prioritize . "Prioritize conferences")
(kom-status-person . "Status (of) user")
(kom-status-conf . "Status (of) conference")
(kom-add-self . "Join (a) conference")
(kom-add-self . "Join conference")
(kom-change-priority . "Change priority")
(kom-list-summary . "List text (subjects)")
(kom-sub-self . "Leave (a) conference")
......
......@@ -589,8 +589,9 @@ If CONF is nil, check the first conf on the to-do list."
(membership->type mship))
(setq continue t))
(progn
(lyskom-sub-member (blocking-do 'get-pers-stat lyskom-pers-no)
conf-stat)
(let ((kom-unsubscribe-makes-passive nil))
(lyskom-sub-member (blocking-do 'get-pers-stat lyskom-pers-no)
conf-stat))
(setq continue nil)
)))
......
......@@ -954,6 +954,9 @@ upptagna. Logga ut och kom tillbaks senare om du v
(no-longer-member-n . "Du r inte lngre medlem i mte %#1m (finns inte).\n")
(have-become-member . "Du har blivit medlem i %#1M.\n")
(have-become-invited-member . "Du har bjudits in till %#1M.
G till mtet fr att acceptera eller tacka nej till inbjudan. Du kan ven
anvnda kommandot 'Bli medlem i mte' fr att acceptera inbjudan.\n")
(have-become-passive-member . "Du har blivit passiv medlem i %#1M.\n")
(message-broadcast . "\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment