[asterisk-commits] branch mogorman/asterisk-xmpp r9154 - in /team/mogorman/asterisk-xmpp: channe...

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Sat Feb  4 22:54:14 2006
New Revision: 9154

URL: http://svn.digium.com/view/asterisk?rev=9154&view=rev
Log:
moving day!

Added:
    team/mogorman/asterisk-xmpp/configs/xmpp.conf
      - copied unchanged from r9150, team/mogorman/asterisk-xmpp/configs/res_xmpp.conf.sample
    team/mogorman/asterisk-xmpp/include/asterisk/xmpp.h
      - copied unchanged from r9150, team/mogorman/asterisk-xmpp/include/asterisk/res_xmpp.h
Removed:
    team/mogorman/asterisk-xmpp/configs/res_xmpp.conf.sample
    team/mogorman/asterisk-xmpp/include/asterisk/res_xmpp.h
Modified:
    team/mogorman/asterisk-xmpp/channels/chan_agent.c
    team/mogorman/asterisk-xmpp/channels/chan_xmpp.c
    team/mogorman/asterisk-xmpp/include/asterisk/app.h
    team/mogorman/asterisk-xmpp/res/res_xmpp.c

Modified: team/mogorman/asterisk-xmpp/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/channels/chan_agent.c?rev=9154&r1=9153&r2=9154&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/channels/chan_agent.c (original)
+++ team/mogorman/asterisk-xmpp/channels/chan_agent.c Sat Feb  4 22:54:14 2006
@@ -71,7 +71,7 @@
 #include "asterisk/astdb.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/monitor.h"
-#include "asterisk/res_xmpp.h"
+#include "asterisk/xmpp.h"
 
 static const char desc[] = "Agent Proxy Channel";
 static const char channeltype[] = "Agent";

Modified: team/mogorman/asterisk-xmpp/channels/chan_xmpp.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/channels/chan_xmpp.c?rev=9154&r1=9153&r2=9154&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/channels/chan_xmpp.c (original)
+++ team/mogorman/asterisk-xmpp/channels/chan_xmpp.c Sat Feb  4 22:54:14 2006
@@ -36,6 +36,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/signal.h>
+#include <iksemel.h>
 
 #include "asterisk.h"
 
@@ -59,6 +60,7 @@
 #include "asterisk/app.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/manager.h"
+#include "asterisk/xmpp.h"
 
 static const char desc[] = "XMPP Channel";
 static const char type[] = "XMPP";

Modified: team/mogorman/asterisk-xmpp/include/asterisk/app.h
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/include/asterisk/app.h?rev=9154&r1=9153&r2=9154&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/include/asterisk/app.h (original)
+++ team/mogorman/asterisk-xmpp/include/asterisk/app.h Sat Feb  4 22:54:14 2006
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include "asterisk/res_xmpp.h"
+#include "asterisk/xmpp.h"
 /* IVR stuff */
 
 /*! \brief Callback function for IVR

Modified: team/mogorman/asterisk-xmpp/res/res_xmpp.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/res/res_xmpp.c?rev=9154&r1=9153&r2=9154&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/res/res_xmpp.c (original)
+++ team/mogorman/asterisk-xmpp/res/res_xmpp.c Sat Feb  4 22:54:14 2006
@@ -28,7 +28,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.43 $")
 
 #include "asterisk/channel.h"
-#include "asterisk/res_xmpp.h"
+#include "asterisk/xmpp.h"
 #include "asterisk/file.h"
 #include "asterisk/config.h"
 #include "asterisk/callerid.h"
@@ -44,7 +44,7 @@
 #include "asterisk/module.h"
 #include "asterisk/astobj.h"
 
-#define XMPP_CONFIG "res_xmpp.conf"
+#define XMPP_CONFIG "xmpp.conf"
 
 AST_MUTEX_DEFINE_STATIC(actionlock);