X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-button.el;h=21b7039a554c586419320003194f2be441ae7bc8;hp=a9ac375b552017ee741a1320b6746d7ac77a2cee;hb=b5365aa756134edbc27c4fd1321716a8311a6fa3;hpb=19d78be9975e134c806acf1969454f4ded1c0f8e

diff --git a/lisp/riece-button.el b/lisp/riece-button.el
index a9ac375..21b7039 100644
--- a/lisp/riece-button.el
+++ b/lisp/riece-button.el
@@ -43,10 +43,10 @@
 
 (defconst riece-user-button-popup-menu
   '("User"
+    ["Finger (WHOIS)" riece-user-button-finger]
     ["Start Private Conversation" riece-user-button-join-partner]
     ["Give Channel Operator Privileges" riece-user-button-set-operators]
-    ["Allow To Speak" riece-user-button-set-speakers]
-    ["Finger (WHOIS)" riece-user-button-finger])
+    ["Allow To Speak" riece-user-button-set-speakers])
   "Menu for user buttons.")
 
 (defvar help-echo-owns-message)
@@ -219,15 +219,8 @@ This function is used as a callback for a channel button."
 			    (list 'local-map riece-identity-button-map
 				  'keymap riece-identity-button-map))))))
 
-(defun riece-button-update-channel-list-buffer ()
-  (save-excursion
-    (set-buffer riece-channel-list-buffer)
-    (riece-button-add-identity-button (point-min) (point-max))))
-
-(defun riece-button-update-user-list-buffer ()
-  (save-excursion
-    (set-buffer riece-user-list-buffer)
-    (riece-button-add-identity-button (point-min) (point-max))))
+(defun riece-button-update-buffer ()
+  (riece-button-add-identity-button (point-min) (point-max)))
 
 (defun riece-button-requires ()
   '(riece-highlight))
@@ -236,20 +229,20 @@ This function is used as a callback for a channel button."
 (defvar riece-user-list-mode-map)
 (defvar riece-dialogue-mode-map)
 (defun riece-button-insinuate ()
-  (add-hook 'riece-update-buffer-functions
-	    'riece-button-update-channel-list-buffer t)
-  (add-hook 'riece-update-buffer-functions
-	    'riece-button-update-user-list-buffer t)
   (add-hook 'riece-channel-list-mode-hook
 	    (lambda ()
 	      (set-keymap-parent riece-channel-list-mode-map widget-keymap)
 	      (set (make-local-variable 'riece-identity-button-map)
-		   (riece-make-identity-button-map))))
+		   (riece-make-identity-button-map))
+	      (add-hook 'riece-update-buffer-functions
+			'riece-button-update-buffer t t)))
   (add-hook 'riece-user-list-mode-hook
 	    (lambda ()
 	      (set-keymap-parent riece-user-list-mode-map widget-keymap)
 	      (set (make-local-variable 'riece-identity-button-map)
-		   (riece-make-identity-button-map))))
+		   (riece-make-identity-button-map))
+	      (add-hook 'riece-update-buffer-functions
+			'riece-button-update-buffer t t)))
   (add-hook 'riece-dialogue-mode-hook
 	    (lambda ()
 	      (set-keymap-parent riece-dialogue-mode-map widget-keymap)