[SCM] emacs-jabber branch, master, updated. 1d8ad84343cf2c7b300c43b9042a563a20ae9063

[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  1d8ad84343cf2c7b300c43b9042a563a20ae9063 (commit)
       via  637cbe4114c51028e6e96de964d8d5d7145fd136 (commit)
      from  e726d72a61e5743eb326a50fc0eb379f577fa0d4 (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 1d8ad84343cf2c7b300c43b9042a563a20ae9063
Author: Magnus Henoch <mag...@gm...>
Date:   Sun May 4 01:13:33 2014 +0100

    Add "Chat with" menu item

diff --git a/jabber-menu.el b/jabber-menu.el
index 98c972f..8cec04b 100644
--- a/jabber-menu.el
+++ b/jabber-menu.el
@@ -30,6 +30,11 @@
       '("Connect" . jabber-connect-all))
 
     (define-key-after map
+      [jabber-menu-chat-with]
+      '(menu-item "Chat with..." jabber-chat-with
+		  :enable (bound-and-true-p jabber-connections)))
+
+    (define-key-after map
       [jabber-menu-nextmsg]
       '(menu-item "Next unread message" jabber-activity-switch-to
 		  :enable (bound-and-true-p jabber-activity-jids)))

commit 637cbe4114c51028e6e96de964d8d5d7145fd136
Author: Magnus Henoch <mag...@gm...>
Date:   Sun May 4 01:10:32 2014 +0100

    Radio buttons for status menu items

diff --git a/jabber-menu.el b/jabber-menu.el
index c5cf9a8..98c972f 100644
--- a/jabber-menu.el
+++ b/jabber-menu.el
@@ -50,29 +50,41 @@
 
     (define-key map
       [jabber-menu-status jabber-menu-status-chat]
-      '("Chatty" .
+      '(menu-item
+	"Chatty"
 	(lambda ()
 	  (interactive)
 	  (jabber-send-presence "chat"
 				(jabber-read-with-input-method "status message: " *jabber-current-status* '*jabber-status-history*)
-				*jabber-current-priority*))))
+				*jabber-current-priority*))
+	:button (:radio . (and (boundp '*jabber-current-show*)
+			       (equal *jabber-current-show* "chat")))))
     (define-key map
       [jabber-menu-status jabber-menu-status-dnd]
-      '("Do not Disturb" .
+      '(menu-item
+	"Do not Disturb"
 	(lambda ()
 	  (interactive)
 	  (jabber-send-presence "dnd"
 				(jabber-read-with-input-method "status message: " *jabber-current-status* '*jabber-status-history*)
-				*jabber-current-priority*))))
+				*jabber-current-priority*))
+	:button (:radio . (and (boundp '*jabber-current-show*)
+			       (equal *jabber-current-show* "dnd")))))
     (define-key map
       [jabber-menu-status jabber-menu-status-xa]
-      '("Extended Away" . jabber-send-xa-presence))
+      '(menu-item "Extended Away" jabber-send-xa-presence
+		  :button (:radio . (and (boundp '*jabber-current-show*)
+					 (equal *jabber-current-show* "xa")))))
     (define-key map
       [jabber-menu-status jabber-menu-status-away]
-      '("Away" . jabber-send-away-presence))
+      '(menu-item "Away" jabber-send-away-presence
+		  :button (:radio . (and (boundp '*jabber-current-show*)
+					 (equal *jabber-current-show* "away")))))
     (define-key map
       [jabber-menu-status jabber-menu-status-online]
-      '("Online" . jabber-send-default-presence))
+      '(menu-item "Online" jabber-send-default-presence
+		  :button (:radio . (and (boundp '*jabber-current-show*)
+					 (equal *jabber-current-show* "")))))
 
     (define-key-after map
       [separator]

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

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


hooks/post-receive
-- 
emacs-jabber