From ddc7811a7b412c9c3c4b6bfb9350dd18a62fdf51 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 5 May 2010 16:52:31 -0700
Subject: [PATCH] Move XMPPHP from core extlibs to Xmpp plugin extlibs

---
 plugins/Xmpp/XmppPlugin.php                          | 4 +---
 {extlib => plugins/Xmpp/extlib}/XMPPHP/BOSH.php      | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/Exception.php | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/Log.php       | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/Roster.php    | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLObj.php    | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLStream.php | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP.php      | 0
 {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP_Old.php  | 0
 9 files changed, 1 insertion(+), 3 deletions(-)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/BOSH.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/Exception.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/Log.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/Roster.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLObj.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMLStream.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP.php (100%)
 rename {extlib => plugins/Xmpp/extlib}/XMPPHP/XMPP_Old.php (100%)

diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index a2521536bc..9d75e2475d 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/XMPPHP');
-
 /**
  * Plugin for XMPP
  *
@@ -287,7 +285,7 @@ class XmppPlugin extends ImPlugin
         switch ($cls)
         {
         case 'XMPPHP_XMPP':
-            require_once 'XMPP.php';
+            require_once $dir . '/extlib/XMPPHP/XMPP.php';
             return false;
         case 'Sharing_XMPP':
         case 'Queued_XMPP':
diff --git a/extlib/XMPPHP/BOSH.php b/plugins/Xmpp/extlib/XMPPHP/BOSH.php
similarity index 100%
rename from extlib/XMPPHP/BOSH.php
rename to plugins/Xmpp/extlib/XMPPHP/BOSH.php
diff --git a/extlib/XMPPHP/Exception.php b/plugins/Xmpp/extlib/XMPPHP/Exception.php
similarity index 100%
rename from extlib/XMPPHP/Exception.php
rename to plugins/Xmpp/extlib/XMPPHP/Exception.php
diff --git a/extlib/XMPPHP/Log.php b/plugins/Xmpp/extlib/XMPPHP/Log.php
similarity index 100%
rename from extlib/XMPPHP/Log.php
rename to plugins/Xmpp/extlib/XMPPHP/Log.php
diff --git a/extlib/XMPPHP/Roster.php b/plugins/Xmpp/extlib/XMPPHP/Roster.php
similarity index 100%
rename from extlib/XMPPHP/Roster.php
rename to plugins/Xmpp/extlib/XMPPHP/Roster.php
diff --git a/extlib/XMPPHP/XMLObj.php b/plugins/Xmpp/extlib/XMPPHP/XMLObj.php
similarity index 100%
rename from extlib/XMPPHP/XMLObj.php
rename to plugins/Xmpp/extlib/XMPPHP/XMLObj.php
diff --git a/extlib/XMPPHP/XMLStream.php b/plugins/Xmpp/extlib/XMPPHP/XMLStream.php
similarity index 100%
rename from extlib/XMPPHP/XMLStream.php
rename to plugins/Xmpp/extlib/XMPPHP/XMLStream.php
diff --git a/extlib/XMPPHP/XMPP.php b/plugins/Xmpp/extlib/XMPPHP/XMPP.php
similarity index 100%
rename from extlib/XMPPHP/XMPP.php
rename to plugins/Xmpp/extlib/XMPPHP/XMPP.php
diff --git a/extlib/XMPPHP/XMPP_Old.php b/plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php
similarity index 100%
rename from extlib/XMPPHP/XMPP_Old.php
rename to plugins/Xmpp/extlib/XMPPHP/XMPP_Old.php