emacs-jabber jabber-chat.el,1.84,1.85 jabber-muc.el,1.71,1.72

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv13669

Modified Files:
	jabber-chat.el jabber-muc.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-417
Creator:  Magnus Henoch <ma...@fr...>

Don't use jabber-nickname


Index: jabber-chat.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-chat.el,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- jabber-chat.el	17 Sep 2007 12:26:07 -0000	1.84
+++ jabber-chat.el	19 Sep 2007 09:06:37 -0000	1.85
@@ -540,7 +540,7 @@
 	    (let ((action (substring body 4))
 		  (nick (cond
 			 ((eq who :local)
-			  jabber-nickname)
+			  (plist-get (fsm-get-state-data jabber-buffer-connection) :username))
 			 ((jabber-muc-message-p xml-data)
 			  (jabber-jid-resource (jabber-xml-get-attribute xml-data 'from)))
 			 (t

Index: jabber-muc.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc.el,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- jabber-muc.el	24 Aug 2007 01:36:06 -0000	1.71
+++ jabber-muc.el	19 Sep 2007 09:06:37 -0000	1.72
@@ -408,7 +408,7 @@
   (interactive 
    (let ((account (jabber-read-account))
 	 (group (jabber-read-jid-completing "group: ")))
-     (list account group (jabber-muc-read-my-nickname group) t)))
+     (list account group (jabber-muc-read-my-nickname group (plist-get (fsm-get-state-data account) :username)) t)))
 
   ;; If the user is already in the room, we don't need as many checks.
   (if (or (assoc group *jabber-active-groupchats*)
@@ -479,12 +479,12 @@
     (let ((buffer (jabber-muc-create-buffer jc group)))
       (switch-to-buffer buffer))))
 
-(defun jabber-muc-read-my-nickname (group)
+(defun jabber-muc-read-my-nickname (group default)
   "Read nickname for joining GROUP."
   (let ((default-nickname (or
 			   ;; XXX: use bookmarks
 			   (cdr (assoc group jabber-muc-default-nicknames))
-			   jabber-nickname)))
+			   default)))
     (jabber-read-with-input-method (format "Nickname: (default %s) "
 					   default-nickname) 
 				   nil nil default-nickname)))
@@ -647,7 +647,7 @@
 	      (let ((action
 		     `(lambda (&rest ignore) (interactive)
 			(jabber-groupchat-join jabber-buffer-connection ,group
-					       (jabber-muc-read-my-nickname ,group)))))
+					       (jabber-muc-read-my-nickname ,group ,(plist-get (fsm-get-state-data jabber-buffer-connection) :username))))))
 		(if (fboundp 'insert-button)
 		    (insert-button "Accept"
 				   'action action)
@@ -689,20 +689,21 @@
 (defun jabber-muc-autojoin (jc)
   "Join rooms specified in account bookmarks and global `jabber-muc-autojoin'."
   (interactive (list (jabber-read-account)))
-  (when (bound-and-true-p jabber-muc-autojoin)
-    (dolist (group jabber-muc-autojoin)
-      (jabber-groupchat-join jc group (or
-				       (cdr (assoc group jabber-muc-default-nicknames))
-				       jabber-nickname))))
-  (jabber-get-bookmarks
-   jc
-   (lambda (jc bookmarks)
-     (dolist (bookmark bookmarks)
-       (setq bookmark (jabber-parse-conference-bookmark bookmark))
-       (when (and bookmark (plist-get bookmark :autojoin))
-	 (jabber-groupchat-join jc (plist-get bookmark :jid)
-				(or (plist-get bookmark :nick)
-				    jabber-nickname)))))))
+  (let ((nickname (plist-get (fsm-get-state-data jc) :username)))
+    (when (bound-and-true-p jabber-muc-autojoin)
+      (dolist (group jabber-muc-autojoin)
+	(jabber-groupchat-join jc group (or
+					 (cdr (assoc group jabber-muc-default-nicknames))
+					 (plist-get (fsm-get-state-data jc) :username)))))
+    (jabber-get-bookmarks
+     jc
+     (lambda (jc bookmarks)
+       (dolist (bookmark bookmarks)
+	 (setq bookmark (jabber-parse-conference-bookmark bookmark))
+	 (when (and bookmark (plist-get bookmark :autojoin))
+	   (jabber-groupchat-join jc (plist-get bookmark :jid)
+				  (or (plist-get bookmark :nick)
+				      (plist-get (fsm-get-state-data jc) :username)))))))))
 
 (defun jabber-muc-message-p (message)
   "Return non-nil if MESSAGE is a groupchat message.