summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlezvous.ca>2008-06-26 03:07:03 -0400
committerEvan Prodromou <evan@controlezvous.ca>2008-06-26 03:07:03 -0400
commit510ae5f3fb1e08dc5bfa96bf9dc004616d5e6b8d (patch)
treea26bb31ad407e1d4de46695f93f9c422a11bf77a
parentb560759df1700f95795bb7880b081cfe7913cc12 (diff)
use jabber library from xmppdaemon program
darcs-hash:20080626070703-34904-b6c6a9b1df39f09221c450dcb3d32f6da6e2df5e.gz
-rw-r--r--lib/jabber.php1
-rw-r--r--xmppdaemon.php2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/jabber.php b/lib/jabber.php
index 2a557bfbe..9bde914a3 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -87,7 +87,6 @@ function jabber_confirm_address($code, $nickname, $address) {
}
-
function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {
$conn = jabber_connect();
diff --git a/xmppdaemon.php b/xmppdaemon.php
index 0906a869a..c32462e17 100644
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -27,7 +27,7 @@ define('INSTALLDIR', dirname(__FILE__));
define('LACONICA', true);
require_once(INSTALLDIR . '/lib/common.php');
-require_once('xmpp.php');
+require_once(INSTALLDIR . '/lib/jabber.php');
class XMPPDaemon {