From 307b9527e6ed344c519a3f20ab6357bc9160e142 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Tue, 2 Sep 2008 13:20:39 -0400
Subject: [PATCH] variable name conflict on reconnect

darcs-hash:20080902172039-84dde-2b1bbac407959af2a5ca0c764aa503f0cb05c785.gz
---
 extlib/XMPPHP/XMLStream.php    | 8 ++++----
 scripts/publicqueuehandler.php | 2 +-
 scripts/xmppconfirmhandler.php | 2 +-
 scripts/xmppdaemon.php         | 2 +-
 scripts/xmppqueuehandler.php   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extlib/XMPPHP/XMLStream.php b/extlib/XMPPHP/XMLStream.php
index b278114079..3916abea23 100644
--- a/extlib/XMPPHP/XMLStream.php
+++ b/extlib/XMPPHP/XMLStream.php
@@ -156,7 +156,7 @@ class XMPPHP_XMLStream {
 	/**
 	 * @var integer
 	 */
-	protected $reconnect = 30;
+	protected $reconnectTimeout = 30;
 
 	/**
 	 * Constructor
@@ -296,14 +296,14 @@ class XMPPHP_XMLStream {
 	 */
 	public function doReconnect() {
 		if(!$this->is_server) {
-			$this->log->log("Reconnecting ($this->reconnect)...",  XMPPHP_Log::LEVEL_WARNING);
-			$this->connect($this->reconnect, false, false);
+			$this->log->log("Reconnecting ($this->reconnectTimeout)...",  XMPPHP_Log::LEVEL_WARNING);
+			$this->connect($this->reconnectTimeout, false, false);
 			$this->reset();
 			$this->event('reconnect');
 		}
 	}
 
-	public function reconnectTimeout($timeout) {
+	public function setReconnectTimeout($timeout) {
 		$this->reconnect = $timeout;
 	}
 	
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index 366c1e5c39..fa4270f09f 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -47,7 +47,7 @@ class PublicQueueHandler extends QueueHandler {
 		if ($this->conn) {
 			$this->conn->addEventHandler('message', 'forward_message', $this);
 			$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
-			$this->conn->reconnectTimeout(600);
+			$this->conn->setReconnectTimeout(600);
 			jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);
 		}
 		return !is_null($this->conn);
diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 3b69d8e8fb..00b5d63b20 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -52,7 +52,7 @@ class XmppConfirmHandler {
 		if ($this->conn) {
 			$this->conn->addEventHandler('message', 'forward_message', $this);
 			$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
-			$this->conn->reconnectTimeout(600);
+			$this->conn->setReconnectTimeout(600);
 			jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);
 		}
 		return !is_null($this->conn);
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 3e866761c3..c29b14b7bd 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -67,7 +67,7 @@ class XMPPDaemon {
 			return false;
 		}
 		
-		$this->conn->reconnectTimeout(600);
+		$this->conn->setReconnectTimeout(600);
 		
 		jabber_send_presence("Send me a message to post a notice", 'available',
 							 NULL, 'available', 100);
diff --git a/scripts/xmppqueuehandler.php b/scripts/xmppqueuehandler.php
index 80fb533810..8b4470d3e3 100755
--- a/scripts/xmppqueuehandler.php
+++ b/scripts/xmppqueuehandler.php
@@ -46,7 +46,7 @@ class XmppQueueHandler extends QueueHandler {
 		# Low priority; we don't want to receive messages
 		$this->conn = jabber_connect($this->_id);
 		if ($this->conn) {
-			$this->conn->reconnectTimeout(600);
+			$this->conn->setReconnectTimeout(600);
 			$this->conn->addEventHandler('message', 'forward_message', $this);
 			$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
 			jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);