From: Miles Bader <miles@gnu.org>
Date: Fri, 22 Dec 2006 08:14:45 +0000 (+0000)
Subject: Merge from gnus--rel--5.10
X-Git-Tag: emacs-pretest-22.0.93~515
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b9e104e5f73c6aaa37998af324f207170624216;p=emacs.git

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 177-178)

   - Merge from emacs--devo--0
   - Update from CVS

2006-12-20  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-group.el (gnus-group-tool-bar-gnome): Exchange connect and
   disconnect icons.  Add help text.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-569
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 047bac04076..317fe617c9f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-group.el (gnus-group-tool-bar-gnome): Exchange connect and
+	disconnect icons.  Add help text.
+
 2006-12-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* legacy-gnus-agent.el: Add Copyright notice.
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index f004a043834..3fe8d71f512 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1018,9 +1018,11 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and
   '((gnus-group-post-news "mail/compose")
     ;; 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
+			       :help "Gnus is currently unplugged.  Click to work online."
+     			       :visible (and gnus-agent (not gnus-plugged)))
+    (gnus-agent-toggle-plugged "connect" t
+			       :help "Gnus is currently plugged.  Click to work offline."
      			       :visible (and gnus-agent gnus-plugged))
     ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar)
     ;; should have a better help text.