[SCM] emacs-jabber branch, master, updated. de83262ef8db3bd318de14df26ea6392f2428fc5

[Magnus H. <leg...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".

The branch, master has been updated
       via  de83262ef8db3bd318de14df26ea6392f2428fc5 (commit)
       via  bdae54a9c1571a36af385a4ea1016549273e5c5c (commit)
      from  a50b9f490254a350b258bada5866acfb69d34a31 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit de83262ef8db3bd318de14df26ea6392f2428fc5
Author: Magnus Henoch <mag...@gm...>
Date:   Sun Aug 25 23:56:13 2013 +0100

    Disable menu items as appropriate
    
    If there are no connections, disable "Disconnect".
    If there are no unread messages, disable "Next unread message".
    
    This also ensures that the functions are loaded when the user might
    try to activate the menu item.

diff --git a/jabber-menu.el b/jabber-menu.el
index fa8a9f3..9bfadd8 100644
--- a/jabber-menu.el
+++ b/jabber-menu.el
@@ -32,11 +32,13 @@
 
     (define-key-after map
       [jabber-menu-nextmsg]
-      '("Next unread message" . jabber-activity-switch-to))
+      '(menu-item "Next unread message" jabber-activity-switch-to
+		  :enable (bound-and-true-p jabber-activity-jids)))
 
     (define-key-after map
       [jabber-menu-disconnect]
-      '("Disconnect" . jabber-disconnect))
+      '(menu-item "Disconnect" jabber-disconnect
+		  :enable (bound-and-true-p jabber-connections)))
 
     (define-key-after map
       [jabber-menu-roster]
@@ -44,8 +46,9 @@
 
     (define-key-after map
       [jabber-menu-status]
-      (cons "Set Status" (make-sparse-keymap "set-status")))
-    
+      `(menu-item "Set Status" ,(make-sparse-keymap "set-status")
+		  :enable (bound-and-true-p jabber-connections)))
+
     (define-key map
       [jabber-menu-status jabber-menu-status-chat]
       '("Chatty" .

commit bdae54a9c1571a36af385a4ea1016549273e5c5c
Author: Magnus Henoch <mag...@gm...>
Date:   Sun Aug 25 23:40:12 2013 +0100

    Reorder menu items; add separator
    
    I put commands used to connect or while connected first, and
    meta-commands (Customize and Help) in a second section.

diff --git a/jabber-menu.el b/jabber-menu.el
index 1135c0f..fa8a9f3 100644
--- a/jabber-menu.el
+++ b/jabber-menu.el
@@ -26,31 +26,23 @@
 ;;;###autoload
 (defvar jabber-menu
   (let ((map (make-sparse-keymap "jabber-menu")))
-    (define-key map
+    (define-key-after map
       [jabber-menu-connect]
       '("Connect" . jabber-connect-all))
 
-    (define-key map
+    (define-key-after map
       [jabber-menu-nextmsg]
       '("Next unread message" . jabber-activity-switch-to))
 
-    (define-key map
+    (define-key-after map
       [jabber-menu-disconnect]
       '("Disconnect" . jabber-disconnect))
 
-    (define-key map
+    (define-key-after map
       [jabber-menu-roster]
       '("Switch to roster" . jabber-switch-to-roster-buffer))
 
-    (define-key map
-      [jabber-menu-customize]
-      '("Customize" . jabber-customize))
-
-    (define-key map
-      [jabber-menu-info]
-      '("Help" . jabber-info))
-
-    (define-key map
+    (define-key-after map
       [jabber-menu-status]
       (cons "Set Status" (make-sparse-keymap "set-status")))
     
@@ -80,6 +72,18 @@
       [jabber-menu-status jabber-menu-status-online]
       '("Online" . jabber-send-default-presence))
 
+    (define-key-after map
+      [separator]
+      '(menu-item "--"))
+
+    (define-key-after map
+      [jabber-menu-customize]
+      '("Customize" . jabber-customize))
+
+    (define-key-after map
+      [jabber-menu-info]
+      '("Help" . jabber-info))
+
     map))
 
 ;;;###autoload

-----------------------------------------------------------------------

Summary of changes:
 jabber-menu.el |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
emacs-jabber