emacs-jabber jabber-conn.el, 2.11, 2.12 jabber.el, 1.79, 1.80 jabber-keepalive.el, 1.7, 1.8 jabber-presence.el, 1.34, 1.35 jabber-socks5.el, 1.16, 1.17 jabber-iq.el, 1.21, 1.22

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv24028

Modified Files:
	jabber-conn.el jabber.el jabber-keepalive.el 
	jabber-presence.el jabber-socks5.el jabber-iq.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-414
Creator:  Magnus Henoch <ma...@fr...>

Remove global variables

Remove jabber-username, jabber-server, jabber-resource, jabber-nickname,
jabber-network-server and jabber-port, and all remaining references to
them.


Index: jabber-presence.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-presence.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- jabber-presence.el	14 Sep 2007 23:14:03 -0000	1.34
+++ jabber-presence.el	17 Sep 2007 12:26:16 -0000	1.35
@@ -91,7 +91,7 @@
     (jabber-roster-update jc new-items changed-items deleted-items)
       
     (if (and id (string= type "set"))
-	(jabber-send-iq jc jabber-server "result" nil
+	(jabber-send-iq jc nil "result" nil
 			nil nil nil nil id)))
 
   ;; After initial roster push, run jabber-post-connect-hooks.  We do

Index: jabber.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- jabber.el	1 Sep 2007 15:58:16 -0000	1.79
+++ jabber.el	17 Sep 2007 12:26:16 -0000	1.80
@@ -87,28 +87,6 @@
 				   (const :tag "Legacy SSL/TLS" ssl))))))
   :group 'jabber-core)
 
-;; XXX: kill these four variables
-(defcustom jabber-username "emacs"
-  "jabber username (user part of JID)" 
-  :type 'string
-  :group 'jabber)
-
-(defcustom jabber-server "magaf.org" 
-  "jabber server (domain part of JID)" 
-  :type 'string
-  :group 'jabber)
-
-(defcustom jabber-password nil
-  "jabber password" 
-  :type '(radio (const :tag "Prompt for password" nil)
-		 (string :tag "Save password in .emacs"))
-  :group 'jabber)
-
-(defcustom jabber-resource "emacs"
-  "jabber resource" 
-  :type 'string
-  :group 'jabber)
-
 (defcustom jabber-default-show ""
   "default show state"
   :type '(choice (const :tag "Online" "")
@@ -128,12 +106,6 @@
   :type 'integer
   :group 'jabber)
 
-;; XXX: kill this one too
-(defcustom jabber-nickname jabber-username
-  "jabber nickname, used in chat buffer prompts and as default groupchat nickname." 
-  :type 'string
-  :group 'jabber)
-
 ;;; guess internal dependencies!
 (require 'jabber-util)
 (require 'jabber-menu)

Index: jabber-keepalive.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-keepalive.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jabber-keepalive.el	31 Jul 2007 07:05:21 -0000	1.7
+++ jabber-keepalive.el	17 Sep 2007 12:26:16 -0000	1.8
@@ -84,7 +84,7 @@
   (dolist (c jabber-connections)
     ;; Whether we get an error or not is not interesting.
     ;; Getting a response at all is.
-    (jabber-send-iq c jabber-server "get"
+    (jabber-send-iq c nil "get"
 		    '(query ((xmlns . "jabber:iq:time")))
 		    'jabber-keepalive-got-response nil
 		    'jabber-keepalive-got-response nil)))

Index: jabber-socks5.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-socks5.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- jabber-socks5.el	28 Apr 2007 14:34:57 -0000	1.16
+++ jabber-socks5.el	17 Sep 2007 12:26:16 -0000	1.17
@@ -146,7 +146,7 @@
 (define-enter-state jabber-socks5 seek-proxies (fsm state-data)
   ;; Look for items at the server.
   (jabber-disco-get-items (plist-get state-data :jc) 
-			  jabber-server nil
+			  nil nil
 			  (lambda (jc fsm result) 
 			    (fsm-send-sync fsm (cons :items result)))
 			  fsm)

Index: jabber-iq.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-iq.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- jabber-iq.el	31 Jul 2007 07:05:11 -0000	1.21
+++ jabber-iq.el	17 Sep 2007 12:26:16 -0000	1.22
@@ -161,7 +161,7 @@
 
 (defun jabber-process-data (jc xml-data closure-data)
   "Process random results from various requests."
-  (let ((from (or (jabber-xml-get-attribute xml-data 'from) jabber-server))
+  (let ((from (or (jabber-xml-get-attribute xml-data 'from) (plist-get (fsm-get-state-data jc) :server)))
 	(xmlns (jabber-iq-xmlns xml-data))
 	(type (jabber-xml-get-attribute xml-data 'type)))
     (with-current-buffer (get-buffer-create (format-spec jabber-browse-buffer-format

Index: jabber-conn.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-conn.el,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -d -r2.11 -r2.12
--- jabber-conn.el	14 Sep 2007 22:08:28 -0000	2.11
+++ jabber-conn.el	17 Sep 2007 12:26:16 -0000	2.12
@@ -47,20 +47,6 @@
 (defgroup jabber-conn nil "Jabber Connection Settings"
   :group 'jabber)
 
-(defcustom jabber-network-server nil
-  "hostname or IP address of server to connect to, if different from `jabber-server'."
-  :type '(radio (const :tag "Same as `jabber-server'" nil)
-		(string :tag "Hostname or IP address"))
-  :group 'jabber-conn)
-
-(defcustom jabber-port nil
-  "jabber port
-The default depends on the connection type: 5222 for ordinary connections
-and 5223 for SSL connections."
-  :type '(choice (const :tag "Default" nil)
-		 (integer :tag "Port number"))
-  :group 'jabber-conn)
-
 (defun jabber-have-starttls ()
   "Return true if we can use STARTTLS."
   (and (featurep 'starttls)