* gnus-group.el (gnus-group-tool-bar-gnome): Fix

gnus-agent-toggle-plugged.  Re-order icons.

* gnus-sum.el (gnus-summary-tool-bar-gnome): Move
gnus-summary-insert-new-articles.

* message.el (message-tool-bar-gnome, message-tool-bar-retro): Fix
comments.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4227d9..5580c53 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2006-02-23  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * gnus-group.el (gnus-group-tool-bar-gnome): Fix
+       gnus-agent-toggle-plugged.  Re-order icons.
+
+       * gnus-sum.el (gnus-summary-tool-bar-gnome): Move
+       gnus-summary-insert-new-articles.
+
+       * message.el (message-tool-bar-gnome, message-tool-bar-retro): Fix
+       comments.
+
        * utf7.el (utf7-utf-16-coding-system): Fix comment.  utf-16-be is
        also available in Emacs 21.3.
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index ffb185f..b950a55 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1031,7 +1031,19 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and
 
 (defcustom gnus-group-tool-bar-gnome
   '((gnus-group-post-news "mail/compose")
-    (gnus-group-get-new-news "mail/inbox") ;; Add... nil :visible gnus-plugged ?
+    (gnus-group-send-queue "mail/outbox" t
+                          :visible (and gnus-agent gnus-plugged)
+                          :help "Send articles from the queue group")
+    (gnus-group-get-new-news "mail/inbox" nil
+                            :visible (or (not gnus-agent)
+                                         gnus-plugged))
+    ;; Some useful agent icons?  I don't use the agent so agent users should
+    ;; suggest useful commands:
+    (gnus-agent-toggle-plugged "connect" t
+                              :visible (and gnus-agent (not gnus-plugged)))
+    (gnus-agent-toggle-plugged "disconnect" t
+                              :visible (and gnus-agent gnus-plugged))
+    ;;
     ;; FIXME: gnus-*-read-group should have a better help text.
     (gnus-topic-read-group "open" nil :visible gnus-topic-mode)
     (gnus-group-read-group "open" nil :visible (not gnus-topic-mode))
@@ -1039,21 +1051,6 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and
     (gnus-group-save-newsrc "save")
     (gnus-group-describe-group "describe")
     (gnus-group-unsubscribe-current-group "gnus/toggle-subscription")
-    ;; (gnus-group-subscribe "subscribe" t
-    ;;                           :help "Subscribe to the current group")
-    ;; (gnus-group-unsubscribe "unsubscribe" t
-    ;;                             :help "Unsubscribe from the current group")
-    ;;
-    ;; Some useful agent icons?  I don't use the agent so agent users should
-    ;; suggest useful commands:
-    (gnus-group-send-queue "mail/outbox" t
-                          :visible (and gnus-agent gnus-plugged)
-                          :help "Send articles from the queue group")
-    (gnus-agent-toggle-plugged "connect" nil
-                              :visible (and gnus-agent (not gnus-plugged)))
-    (gnus-agent-toggle-plugged "disconnect" nil
-                              :visible (and gnus-agent gnus-plugged))
-    ;;
     (gnus-group-exit "exit")
     (gnus-info-find-node "help"))
   "List of functions for the group tool bar (GNOME style).

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 224d7d8..f13841f 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2671,6 +2671,8 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and
 
 (defcustom gnus-summary-tool-bar-gnome
   '((gnus-summary-post-news "mail/compose" nil)
+    (gnus-summary-insert-new-articles "mail/inbox")
+    ;;
     (gnus-summary-reply-with-original "mail/reply")
     (gnus-summary-reply "mail/reply" nil :visible nil)
     (gnus-summary-followup-with-original "mail/reply-all")
@@ -2699,10 +2701,8 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and
     (gnus-summary-enter-digest-group "right_arrow" nil :visible nil)
     ;;
     ;; Maybe some sort-by-... could be added:
-    (gnus-summary-sort-by-author "sort-a-z" nil :visible nil)
-    (gnus-summary-sort-by-date "sort-1-9" nil :visible nil)
-    ;;
-    (gnus-summary-insert-new-articles "mail/inbox")
+    ;; (gnus-summary-sort-by-author "sort-a-z" nil :visible nil)
+    ;; (gnus-summary-sort-by-date "sort-1-9" nil :visible nil)
     ;;
     (gnus-summary-exit "exit")
     ;; (customize-group 'gnus-summary) "preferences"

diff --git a/lisp/message.el b/lisp/message.el
index a493892..973b762 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6745,8 +6745,6 @@ Pre-defined symbols include `message-tool-bar-gnome' and
     (ispell-message "spell" nil :visible (not flyspell-mode))
     (flyspell-buffer "spell" t :visible flyspell-mode
                     :help "Flyspell whole buffer")
-    ;; We should have a mail-preview icon with an envelope like the one in
-    ;; stock_mail-reply.
     (mml-preview "mail/preview" mml-mode-map)
     (mml-secure-message-sign-encrypt "lock" mml-mode-map :visible nil)
     (message-insert-importance-high "important" nil :visible nil)
@@ -6763,7 +6761,7 @@ See `gmm-tool-bar-from-list' for details on the format of the list."
   :group 'message)
 
 (defcustom message-tool-bar-retro
-  '(;; Old Emacs 21 icon for consitency.
+  '(;; Old Emacs 21 icon for consistency.
     (message-send-and-exit "gnus/mail_send")
     (message-kill-buffer "close")
     (message-dont-send "cancel")