diff -ruN shit0/jabber-muc.el shit1/jabber-muc.el
--- shit0/jabber-muc.el 2010-02-08 17:29:01.000000000 +0400
+++ shit1/jabber-muc.el 2010-02-08 19:18:24.000000000 +0400
@@ -166,19 +166,20 @@
This gets prepended to `jabber-chat-printers', which see.")
;;;###autoload
-(defun jabber-muc-get-buffer (group)
+(defun jabber-muc-get-buffer (group &optional jc)
"Return the chat buffer for chatroom GROUP.
Either a string or a buffer is returned, so use `get-buffer' or
`get-buffer-create'."
(format-spec jabber-groupchat-buffer-format
(list
- (cons ?n (jabber-jid-displayname group))
+ (cons ?n (jabber-jid-bookmarkname jc group))
+ ;(cons ?n (jabber-jid-displayname group))
(cons ?j (jabber-jid-user group)))))
(defun jabber-muc-create-buffer (jc group)
"Prepare a buffer for chatroom GROUP.
This function is idempotent."
- (with-current-buffer (get-buffer-create (jabber-muc-get-buffer group))
+ (with-current-buffer (get-buffer-create (jabber-muc-get-buffer group jc))
(unless (eq major-mode 'jabber-chat-mode)
(jabber-chat-mode jc #'jabber-chat-pp))
;; Make sure the connection variable is up to date.
@@ -989,7 +990,7 @@
(jabber-muc-remove-groupchat group))
;; If there is no buffer for this groupchat, don't bother
;; creating one just to tell that user left the room.
- (let ((buffer (get-buffer (jabber-muc-get-buffer group))))
+ (let ((buffer (get-buffer (jabber-muc-get-buffer group jc))))
(if buffer
(with-current-buffer buffer
(jabber-maybe-print-rare-time
diff -ruN shit0/jabber-ourversion.el shit1/jabber-ourversion.el
--- shit0/jabber-ourversion.el 1970-01-01 04:00:00.000000000 +0400
+++ shit1/jabber-ourversion.el 2010-02-08 17:29:27.000000000 +0400
@@ -0,0 +1,7 @@
+;; jabber-ourversion.el. Generated from jabber-ourversion.el.in by configure.
+
+;; This value gets updated automatically when configure.ac is changed.
+(defconst jabber-version "0.8.0"
+ "version returned to those who query us")
+
+(provide 'jabber-ourversion)
diff -ruN shit0/jabber-util.el shit1/jabber-util.el
--- shit0/jabber-util.el 2010-02-08 17:29:01.000000000 +0400
+++ shit1/jabber-util.el 2010-02-08 19:17:59.000000000 +0400
@@ -185,6 +185,14 @@
(symbol-name string)
string))))
+(defun jabber-jid-bookmarkname (jc string)
+ "return the conference name from boomark or jid if not set"
+ (or (if jc (loop for conference in (gethash (jabber-connection-bare-jid jc) jabber-bookmarks)
+ do (let ((ls (cadr conference)))
+ (if (string= (cdr (assoc 'jid ls)) string)
+ (return (cdr (assoc 'name ls)))))))
+ (jabber-jid-user (jabber-jid-displayname string))))
+
(defun jabber-jid-resource (string)
"return the resource portion of a JID, or nil if there is none."
(when (string-match "^\\(\\([^/]*@\\)?[^/]*\\)/\\(.*\\)" string)