* Riece: Version 3.1.0 released.

[riece] / lisp / riece-toolbar.el

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index 1335eca..75bcb2f 100644 (file)
--- a/lisp/riece-toolbar.el
+++ b/lisp/riece-toolbar.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -86,8 +86,10 @@
                  (specifier-specs default-toolbar (current-buffer)))
            (set-specifier default-toolbar toolbar (current-buffer)))
          (defun riece-unset-toolbar ()
-           (set-specifier default-toolbar riece-toolbar-original-toolbar
-                          (current-buffer))
+           (if riece-toolbar-original-toolbar
+               (set-specifier default-toolbar riece-toolbar-original-toolbar
+                              (current-buffer))
+             (remove-specifier default-toolbar (current-buffer)))
            (kill-local-variable 'riece-toolbar-original-toolbar)))
       (defalias 'riece-make-toolbar-from-menu 'ignore)
       (defalias 'riece-set-toolbar 'ignore)
@@ -119,15 +121,18 @@
   '(riece-menu))
 
 (defun riece-toolbar-insinuate ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+       (riece-toolbar-command-mode-hook)))
   (add-hook 'riece-command-mode-hook
-           'riece-toolbar-command-mode-hook
-           t))
+           'riece-toolbar-command-mode-hook t))
 
 (defun riece-toolbar-uninstall ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+       (riece-unset-toolbar)))
   (remove-hook 'riece-command-mode-hook
-              'riece-toolbar-command-mode-hook)
-  (with-current-buffer riece-command-buffer
-    (riece-unset-toolbar)))
+              'riece-toolbar-command-mode-hook))
 
 (provide 'riece-toolbar)