X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-menu.el;h=d11641e1f4271b32331464f421b256b769e18fa7;hp=2c349e98eca7586afda01e36be35186fb6758a4a;hb=3354b4d91c95d7b050c5e73e691ce7324406ca41;hpb=e181f1a7f1ea36733e4604ffb97814d50c4e2295

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 2c349e9..d11641e 100644
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -38,6 +38,7 @@
 (defvar riece-menu-items
   `("Riece"
     ["Version" riece-version t]
+    ["Submit Bug Report" riece-submit-bug-report t]
     "----"
     ("Change Window Layout..." :filter riece-menu-create-layouts-menu)
     ["Toggle Freeze Channel Buffer"
@@ -61,17 +62,16 @@
     ["Kick User" riece-command-kick riece-current-channel]
     ["Invite User" riece-command-invite riece-current-channel]
     "----"
+    ["Next Channel" riece-command-next-channel riece-current-channels]
+    ["Previous Channel" riece-command-previous-channel riece-current-channels]
+    "----"
     ("Channels" :filter riece-menu-create-channels-menu)
     ("Servers" :filter riece-menu-create-servers-menu))
   "Menu used in command mode.")
 
-(defvar riece-menu-enabled nil)
-
 (defconst riece-menu-description
   "Setup command menus on menubar")
 
-(put 'riece-menu 'riece-addon-default-disabled t)
-
 (defun riece-menu-create-layouts-menu (menu)
   (mapcar (lambda (entry)
 	    (vector (car entry) (list 'riece-command-change-layout (car entry))
@@ -102,7 +102,7 @@
 	  riece-server-alist))
 
 (defvar riece-command-mode-map)
-
+(defvar riece-menu)
 (defun riece-menu-insinuate ()
   (add-hook 'riece-command-mode-hook
 	    (lambda ()
@@ -110,17 +110,7 @@
 				riece-command-mode-map
 				"Riece Menu"
 				riece-menu-items)
-	      (riece-enable-addon 'riece-menu))))
-
-(defun riece-menu-enable ()
-  (with-current-buffer riece-command-buffer
-    (easy-menu-add riece-menu))
-  (setq riece-menu-enabled t))
-
-(defun riece-menu-disable ()
-  (with-current-buffer riece-command-buffer
-    (easy-menu-remove riece-menu))
-  (setq riece-menu-enabled nil))
+	      (easy-menu-add riece-menu))))
 
 (provide 'riece-menu)