Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3336
Modified Files:
jabber-bookmarks.el jabber-muc.el NEWS
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-352
Creator: Magnus Henoch <ma...@fr...>
Reactivate jabber-muc-autojoin variable
Based on patch from Kirill A. Korinskiy.
Index: NEWS
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/NEWS,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- NEWS 28 Apr 2007 15:00:36 -0000 1.56
+++ NEWS 6 May 2007 14:53:11 -0000 1.57
@@ -13,6 +13,9 @@
See jabber-clean-top and new option for jabber-alert-muc-hooks.
(not documented yet)
+** MUC bookmarks
+(not documented yet)
+
* New features in jabber.el 0.7.1
** STARTTLS
Index: jabber-muc.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc.el,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- jabber-muc.el 9 Apr 2007 16:37:40 -0000 1.67
+++ jabber-muc.el 6 May 2007 14:53:11 -0000 1.68
@@ -48,29 +48,20 @@
"The topic of the current MUC room.")
(defcustom jabber-muc-default-nicknames nil
- "Obsolete variable.
-Call `jabber-edit-bookmarks' to migrate settings.
-Use `jabber-get-conference-data' in programs."
+ "Default nickname for specific MUC rooms."
:group 'jabber-chat
:type '(repeat
(cons :format "%v"
(string :tag "JID of room")
(string :tag "Nickname"))))
-(make-obsolete-variable
- 'jabber-muc-default-nicknames
- "Call `jabber-edit-bookmarks' to migrate settings.
-Use `jabber-get-conference-data' in programs.")
(defcustom jabber-muc-autojoin nil
- "Obsolete variable.
-Call `jabber-edit-bookmarks' to migrate settings.
-Use `jabber-get-conference-data' in programs."
+ "List of MUC rooms to automatically join on connection.
+This list is saved in your Emacs customizations. You can also store
+such a list on the Jabber server, where it is available to every
+client; see `jabber-edit-bookmarks'."
:group 'jabber-chat
:type '(repeat (string :tag "JID of room")))
-(make-obsolete-variable
- 'jabber-muc-autojoin
- "Call `jabber-edit-bookmarks' to migrate settings.
-Use `jabber-get-conference-data' in programs.")
(defcustom jabber-muc-disable-disco-check nil
"If non-nil, disable checking disco#info of rooms before joining them.
@@ -695,11 +686,13 @@
(return t))))))
(defun jabber-muc-autojoin (jc)
- "Join rooms specified in account bookmarks."
+ "Join rooms specified in account bookmarks and global `jabber-muc-autojoin'."
(interactive (list (jabber-read-account)))
- (when (or (bound-and-true-p jabber-muc-autojoin)
- (bound-and-true-p jabber-muc-default-nicknames))
- (warn "`jabber-muc-autojoin' and `jabber-muc-default-nicknames' will not be heeded."))
+ (when (bound-and-true-p jabber-muc-autojoin)
+ (dolist (group jabber-muc-autojoin)
+ (jabber-groupchat-join jc group (or
+ (cdr (assoc group jabber-muc-default-nicknames))
+ jabber-nickname))))
(jabber-get-bookmarks
jc
(lambda (jc bookmarks)
Index: jabber-bookmarks.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-bookmarks.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jabber-bookmarks.el 20 Mar 2007 16:13:05 -0000 1.6
+++ jabber-bookmarks.el 6 May 2007 14:53:11 -0000 1.7
@@ -134,8 +134,9 @@
(when (or (bound-and-true-p jabber-muc-autojoin)
(bound-and-true-p jabber-muc-default-nicknames))
(widget-insert "The variables `jabber-muc-autojoin' and/or `jabber-muc-default-nicknames'\n"
- "contain values, but they have no effect in this version of jabber.el.\n"
- "You may want to import them into your bookmarks.\n")
+ "contain values. They are only available to jabber.el on this machine.\n"
+ "You may want to import them into your bookmarks, to make them available\n"
+ "to any client on any machine.\n")
(widget-create 'push-button :notify 'jabber-bookmarks-import "Import values from variables")
(widget-insert "\n\n"))
|
