* gnus-group.el (gnus-group-make-tool-bar): Add IMAGE argument to

gmm-image-load-path calls.

* gnus-sum.el (gnus-summary-make-tool-bar): Ditto.

* message.el (message-make-tool-bar): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d3303b..30924e4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2006-02-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * gnus-group.el (gnus-group-make-tool-bar): Add IMAGE argument to
+       gmm-image-load-path calls.
+
+       * gnus-sum.el (gnus-summary-make-tool-bar): Ditto.
+
+       * message.el (message-make-tool-bar): Ditto.
+
        * mml.el (mml-preview): Added comment concerning tool bar icons.
 
        * gnus-group.el (gnus-group-tool-bar-gnome): Use new icon names.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 8a255e9..f791c25 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1115,8 +1115,12 @@ When FORCE, rebuild the tool bar."
             ;; The Gnus 5.10.6 code checked (default-value 'tool-bar-mode).
             ;; Why?  --rsteib
             (or (not gnus-group-tool-bar-map) force))
-    (let* ((load-path (gmm-image-load-path "gnus" nil 'load-path))
-          (image-load-path (gmm-image-load-path "gnus" nil 'image-load-path))
+    (let* ((load-path
+           (gmm-image-load-path "gnus" "gnus/toggle-subscription.xpm"
+                                'load-path))
+          (image-load-path
+           (gmm-image-load-path "gnus" "gnus/toggle-subscription.xpm"
+                                'image-load-path))
           (map (gmm-tool-bar-from-list gnus-group-tool-bar
                                        gnus-group-tool-bar-zap-list
                                        'gnus-group-mode-map)))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 6c39ee2..3b937f5 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2769,8 +2769,10 @@ When FORCE, rebuild the tool bar."
             (boundp 'tool-bar-mode)
             tool-bar-mode
             (or (not gnus-summary-tool-bar-map) force))
-    (let* ((load-path (gmm-image-load-path "gnus" nil 'load-path))
-          (image-load-path (gmm-image-load-path "gnus" nil 'image-load-path))
+    (let* ((load-path
+           (gmm-image-load-path "gnus" "mail/save.xpm" 'load-path))
+          (image-load-path
+           (gmm-image-load-path "gnus" "mail/save.xpm" 'image-load-path))
           (map (gmm-tool-bar-from-list gnus-summary-tool-bar
                                        gnus-summary-tool-bar-zap-list
                                        'gnus-summary-mode-map)))

diff --git a/lisp/message.el b/lisp/message.el
index 8cc106e..829b968 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6803,9 +6803,12 @@ When FORCE, rebuild the tool bar."
             tool-bar-mode
             (or (not message-tool-bar-map) force))
     (setq message-tool-bar-map
-         (let ((load-path (gmm-image-load-path "message" nil 'load-path))
+         (let ((load-path
+                (gmm-image-load-path "message" "mail/save-draft.xpm"
+                                     'load-path))
                (image-load-path
-                (gmm-image-load-path "message" nil 'image-load-path)))
+                (gmm-image-load-path "message" "mail/save-draft.xpm"
+                                     'image-load-path)))
            (gmm-tool-bar-from-list message-tool-bar
                                    message-tool-bar-zap-list
                                    'message-mode-map))))