* riece-toolbar.el [XEmacs] (riece-make-toolbar-from-menu):

Pick up toolbar icons from etc/riece/.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed51e1e..be8b40d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-20  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-toolbar.el [XEmacs] (riece-make-toolbar-from-menu):
+       Pick up toolbar icons from etc/riece/.
+
 2005-03-12  Daiki Ueno  <ueno@unixuser.org>
 
        * riece.el (riece-buffer-alist): Init riece-debug-buffer.

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index d6e09ac..fc22878 100644 (file)
--- a/lisp/riece-toolbar.el
+++ b/lisp/riece-toolbar.el
@@ -62,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))