2005-09-30 Bill Wohler <wohler@newt.com>

	Moved MH-E image files from toolbar and mail directories into
	etc/images.

	* mail/reply2.*: Moved to etc/images/mail/reply*.

	* toolbar/execute.*, toolbar/highlight.*, toolbar/mh-logo.xpm:
	* toolbar/page-down.*, toolbar/show.*, toolbar/widen.*: Moved to
	etc/images.

	* toolbar/alias.*, toolbar/refile.*, toolbar/repack.*:
	* toolbar/reply*: Moved to etc/images/mail.

	* toolbar/rescan.*: Moved and renamed to etc/images/refresh.*.

	* mh-e/mh-customize.el (mh-refile-msg, mh-tool-bar-reply-from)
	(mh-tool-bar-reply-to, mh-tool-bar-reply-all)
	(mh-alias-grab-from-field, mh-pack-folder): Image files moved to
	etc/images/mail so added "mail/" prefix.
	(mh-reply): Ditto. Also renamed reply2.* to reply.*.
	(mh-rescan-folder): Ditto. Renamed image file to refresh.* since
	it can be used in the general sense. Does not have "mail/" prefix.

30 files changed, 34 insertions, 8 deletions

diff --git a/lisp/toolbar/execute.pbm b/etc/images/execute.pbm
index 84bcbb38428..84bcbb38428 100644
--- a/lisp/toolbar/execute.pbm
+++ b/etc/images/execute.pbm
diff --git a/lisp/toolbar/execute.xpm b/etc/images/execute.xpm
index ce38c629f73..ce38c629f73 100644
--- a/lisp/toolbar/execute.xpm
+++ b/etc/images/execute.xpm
diff --git a/lisp/toolbar/highlight.pbm b/etc/images/highlight.pbm
index 23394f05e27..23394f05e27 100644
--- a/lisp/toolbar/highlight.pbm
+++ b/etc/images/highlight.pbm
diff --git a/lisp/toolbar/highlight.xpm b/etc/images/highlight.xpm
index 1844128f02f..1844128f02f 100644
--- a/lisp/toolbar/highlight.xpm
+++ b/etc/images/highlight.xpm
diff --git a/lisp/toolbar/alias.pbm b/etc/images/mail/alias.pbm
index cdd42c3632c..cdd42c3632c 100644
--- a/lisp/toolbar/alias.pbm
+++ b/etc/images/mail/alias.pbm
diff --git a/lisp/toolbar/alias.xpm b/etc/images/mail/alias.xpm
index 8bf75063bdc..8bf75063bdc 100644
--- a/lisp/toolbar/alias.xpm
+++ b/etc/images/mail/alias.xpm
diff --git a/lisp/toolbar/refile.pbm b/etc/images/mail/refile.pbm
index 64e534ecc89..64e534ecc89 100644
--- a/lisp/toolbar/refile.pbm
+++ b/etc/images/mail/refile.pbm
diff --git a/lisp/toolbar/refile.xpm b/etc/images/mail/refile.xpm
index 561012d8505..561012d8505 100644
--- a/lisp/toolbar/refile.xpm
+++ b/etc/images/mail/refile.xpm
diff --git a/lisp/toolbar/repack.pbm b/etc/images/mail/repack.pbm
index 502b1179939..502b1179939 100644
--- a/lisp/toolbar/repack.pbm
+++ b/etc/images/mail/repack.pbm
diff --git a/lisp/toolbar/repack.xpm b/etc/images/mail/repack.xpm
index b50b8f37551..b50b8f37551 100644
--- a/lisp/toolbar/repack.xpm
+++ b/etc/images/mail/repack.xpm
diff --git a/lisp/toolbar/reply-all.pbm b/etc/images/mail/reply-all.pbm
index 57503cbea7c..57503cbea7c 100644
--- a/lisp/toolbar/reply-all.pbm
+++ b/etc/images/mail/reply-all.pbm
diff --git a/lisp/toolbar/reply-all.xpm b/etc/images/mail/reply-all.xpm
index 43453ee4d3a..43453ee4d3a 100644
--- a/lisp/toolbar/reply-all.xpm
+++ b/etc/images/mail/reply-all.xpm
diff --git a/lisp/toolbar/reply-from.pbm b/etc/images/mail/reply-from.pbm
index 99fad608f30..99fad608f30 100644
--- a/lisp/toolbar/reply-from.pbm
+++ b/etc/images/mail/reply-from.pbm
diff --git a/lisp/toolbar/reply-from.xpm b/etc/images/mail/reply-from.xpm
index 543850f4b5e..543850f4b5e 100644
--- a/lisp/toolbar/reply-from.xpm
+++ b/etc/images/mail/reply-from.xpm
diff --git a/lisp/toolbar/reply-to.pbm b/etc/images/mail/reply-to.pbm
index d7dc6391b69..d7dc6391b69 100644
--- a/lisp/toolbar/reply-to.pbm
+++ b/etc/images/mail/reply-to.pbm
diff --git a/lisp/toolbar/reply-to.xpm b/etc/images/mail/reply-to.xpm
index bce818c4804..bce818c4804 100644
--- a/lisp/toolbar/reply-to.xpm
+++ b/etc/images/mail/reply-to.xpm
diff --git a/lisp/mail/reply2.pbm b/etc/images/mail/reply.pbm
index f48b34be3ae..f48b34be3ae 100644
--- a/lisp/mail/reply2.pbm
+++ b/etc/images/mail/reply.pbm
diff --git a/lisp/mail/reply2.xpm b/etc/images/mail/reply.xpm
index 047f8533d7c..047f8533d7c 100644
--- a/lisp/mail/reply2.xpm
+++ b/etc/images/mail/reply.xpm
diff --git a/lisp/toolbar/mh-logo.xpm b/etc/images/mh-logo.xpm
index ce6b97c2f5a..ce6b97c2f5a 100644
--- a/lisp/toolbar/mh-logo.xpm
+++ b/etc/images/mh-logo.xpm
diff --git a/lisp/toolbar/page-down.pbm b/etc/images/page-down.pbm
index 2f577146b63..2f577146b63 100644
--- a/lisp/toolbar/page-down.pbm
+++ b/etc/images/page-down.pbm
diff --git a/lisp/toolbar/page-down.xpm b/etc/images/page-down.xpm
index 3ef0f24ee0e..3ef0f24ee0e 100644
--- a/lisp/toolbar/page-down.xpm
+++ b/etc/images/page-down.xpm
diff --git a/lisp/toolbar/rescan.pbm b/etc/images/refresh.pbm
index a373ee8819c..a373ee8819c 100644
--- a/lisp/toolbar/rescan.pbm
+++ b/etc/images/refresh.pbm
diff --git a/lisp/toolbar/rescan.xpm b/etc/images/refresh.xpm
index 922b8f4a713..922b8f4a713 100644
--- a/lisp/toolbar/rescan.xpm
+++ b/etc/images/refresh.xpm
diff --git a/lisp/toolbar/show.pbm b/etc/images/show.pbm
index d86b1e6fe77..d86b1e6fe77 100644
--- a/lisp/toolbar/show.pbm
+++ b/etc/images/show.pbm
diff --git a/lisp/toolbar/show.xpm b/etc/images/show.xpm
index 659226b8280..659226b8280 100644
--- a/lisp/toolbar/show.xpm
+++ b/etc/images/show.xpm
diff --git a/lisp/toolbar/widen.pbm b/etc/images/widen.pbm
index 2d9780b9959..2d9780b9959 100644
--- a/lisp/toolbar/widen.pbm
+++ b/etc/images/widen.pbm
diff --git a/lisp/toolbar/widen.xpm b/etc/images/widen.xpm
index 0b87fc9752e..0b87fc9752e 100644
--- a/lisp/toolbar/widen.xpm
+++ b/etc/images/widen.xpm
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23fd172b03d..218635dc053 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2005-09-30  Bill Wohler  <wohler@newt.com>
+
+        Moved MH-E image files from toolbar and mail directories into
+        etc/images.
+
+        * mail/reply2.*: Moved to etc/images/mail/reply*.
+
+        * toolbar/execute.*, toolbar/highlight.*, toolbar/mh-logo.xpm:
+        * toolbar/page-down.*, toolbar/show.*, toolbar/widen.*: Moved to
+        etc/images.
+        
+        * toolbar/alias.*, toolbar/refile.*, toolbar/repack.*:
+        * toolbar/reply*: Moved to etc/images/mail.
+
+        * toolbar/rescan.*: Moved and renamed to etc/images/refresh.*.
+
 2005-09-30  Eric M. Ludlam <zappo@gnu.org>
 
         * speedbar.el: New version 1.0pre3.
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index e851b399ce0..9e1759ee524 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-30  Bill Wohler  <wohler@newt.com>
+
+        * mh-customize.el (mh-refile-msg, mh-tool-bar-reply-from)
+        (mh-tool-bar-reply-to, mh-tool-bar-reply-all)
+        (mh-alias-grab-from-field, mh-pack-folder): Image files moved to
+        etc/images/mail so added "mail/" prefix.
+        (mh-reply): Ditto. Also renamed reply2.* to reply.*.
+        (mh-rescan-folder): Ditto. Renamed image file to refresh.* since
+        it can be used in the general sense. Does not have "mail/" prefix.
+
 2005-09-24  Emilio C. Lopes  <eclig@gmx.net>
 
         * mh-mime.el (mh-compose-forward, mh-mhn-compose-forw):
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index 4a9882b566c..7fbb1c247b4 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -1922,7 +1922,7 @@ This button runs `mh-previous-undeleted-msg'")
     "Go to the next undeleted message\nThe button runs `mh-next-undeleted-msg'")
   (mh-delete-msg (folder) "close"
     "Mark this message for deletion\nThis button runs `mh-delete-msg'")
-  (mh-refile-msg (folder) "refile"
+  (mh-refile-msg (folder) "mail/refile"
     "Refile this message\nThis button runs `mh-refile-msg'")
   (mh-undo (folder) "undo" "Undo last operation\nThis button runs `undo'"
     (mh-outstanding-commands-p))
@@ -1933,19 +1933,19 @@ This button runs `mh-previous-undeleted-msg'")
     "Toggle tick mark\nThis button runs `mh-toggle-tick'")
   (mh-toggle-showing (folder) "show"
     "Toggle showing message\nThis button runs `mh-toggle-showing'")
-  (mh-tool-bar-reply-from (folder) "reply-from" "Reply to \"from\"")
-  (mh-tool-bar-reply-to (folder) "reply-to" "Reply to \"to\"")
-  (mh-tool-bar-reply-all (folder) "reply-all" "Reply to \"all\"")
-  (mh-reply (folder) "mail/reply2"
+  (mh-tool-bar-reply-from (folder) "mail/reply-from" "Reply to \"from\"")
+  (mh-tool-bar-reply-to (folder) "mail/reply-to" "Reply to \"to\"")
+  (mh-tool-bar-reply-all (folder) "mail/reply-all" "Reply to \"all\"")
+  (mh-reply (folder) "mail/reply"
     "Reply to this message\nThis button runs `mh-reply'")
-  (mh-alias-grab-from-field (folder) "alias"
+  (mh-alias-grab-from-field (folder) "mail/alias"
     "Grab From alias\nThis button runs `mh-alias-grab-from-field'"
     (and (mh-extract-from-header-value) (not (mh-alias-for-from-p))))
   (mh-send (folder) "mail_compose"
     "Compose new message\nThis button runs `mh-send'")
-  (mh-rescan-folder (folder) "rescan"
+  (mh-rescan-folder (folder) "refresh"
     "Rescan this folder\nThis button runs `mh-rescan-folder'")
-  (mh-pack-folder (folder) "repack"
+  (mh-pack-folder (folder) "mail/repack"
     "Repack this folder\nThis button runs `mh-pack-folder'")
   (mh-tool-bar-search (folder) "search"
     "Search\nThis button runs `mh-tool-bar-search-function'")