Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion jabber-alert.el
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ Examples:

;; Alert hooks
(define-jabber-alert echo "Show a message in the echo area"
(lambda (text &optional title) (message "%s" (or title text))))
(lambda (text &optional title) (unless (minibuffer-window-active-p (minibuffer-window))
(message "%s" (or title text)))))
(define-jabber-alert beep "Beep on event"
(lambda (&rest ignore) (beep)))

Expand Down
14 changes: 14 additions & 0 deletions jabber-muc.el
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,20 @@ enter it."
(add-to-list 'jabber-jid-muc-menu
(cons "Join groupchat" 'jabber-muc-join))

(defun jabber-muc-join-group ()
(interactive)
(let ((account (jabber-read-account)))
(jabber-get-bookmarks account
#'(lambda (jc bms)
(let (groups group nickname)
(mapc #'(lambda (b)
(when (eq 'conference (jabber-xml-node-name b))
(push (make-symbol (jabber-xml-get-attribute b 'jid)) groups)))
bms)
(setq group (jabber-read-jid-completing "group: " groups)
nickname (jabber-muc-read-my-nickname jc group))
(jabber-muc-join jc group nickname))))))

(defun jabber-muc-join (jc group nickname &optional popup)
"join a groupchat, or change nick.
In interactive calls, or if POPUP is true, switch to the
Expand Down