* riece-ruby.el: Implement add-on API.

[riece] / lisp / riece-toolbar.el

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index 7c80bee..fc22878 100644 (file)
--- a/lisp/riece-toolbar.el
+++ b/lisp/riece-toolbar.el
@@ -31,6 +31,9 @@
 
 (require 'riece-menu)
 
+(defconst riece-toolbar-description
+  "Show toolbar icons.")
+
 (defvar riece-toolbar-items
   '(riece-command-quit
     riece-command-join
@@ -59,10 +62,14 @@
            (let ((pointer items)
                  toolbar
                  file
-                 menu-item)
+                 menu-item
+                 (riece-data-directory (locate-data-directory "riece")))
              (while pointer
                (setq file (locate-file (symbol-name (car pointer))
-                                       load-path
+                                       (if riece-data-directory
+                                           (cons riece-data-directory
+                                                 load-path)
+                                         load-path)
                                        '(".xpm" ".pbm" ".xbm"))
                      menu-item (riece-toolbar-find-menu-item (car pointer)))
                (if (and file (file-exists-p file))