[asterisk-commits] branch mogorman/asterisk-xmpp r19499 - in /team/mogorman/asterisk-xmpp: chann...

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Tue Apr 11 20:56:22 2006
New Revision: 19499

URL: http://svn.digium.com/view/asterisk?rev=19499&view=rev
Log:
no comment

Added:
    team/mogorman/asterisk-xmpp/configs/jabber.conf.sample   (props changed)
      - copied unchanged from r19092, team/mogorman/asterisk-xmpp/configs/xmpp.conf.sample
    team/mogorman/asterisk-xmpp/include/asterisk/jabber.h   (props changed)
      - copied unchanged from r19498, team/mogorman/asterisk-xmpp/include/asterisk/xmpp.h
    team/mogorman/asterisk-xmpp/res/res_jabber.c   (contents, props changed)
      - copied, changed from r19498, team/mogorman/asterisk-xmpp/res/res_xmpp.c
Removed:
    team/mogorman/asterisk-xmpp/configs/xmpp.conf.sample
    team/mogorman/asterisk-xmpp/include/asterisk/xmpp.h
    team/mogorman/asterisk-xmpp/res/res_xmpp.c
Modified:
    team/mogorman/asterisk-xmpp/channels/chan_jingle.c
    team/mogorman/asterisk-xmpp/res/Makefile

Modified: team/mogorman/asterisk-xmpp/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/channels/chan_jingle.c?rev=19499&r1=19498&r2=19499&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/channels/chan_jingle.c (original)
+++ team/mogorman/asterisk-xmpp/channels/chan_jingle.c Tue Apr 11 20:56:22 2006
@@ -63,7 +63,7 @@
 #include "asterisk/manager.h"
 #include "asterisk/stringfields.h"
 #include "asterisk/utils.h"
-#include "asterisk/xmpp.h"
+#include "asterisk/jabber.h"
 #include "asterisk/jingle.h"
 
 #define JINGLE_CONFIG "jingle.conf"

Propchange: team/mogorman/asterisk-xmpp/configs/jabber.conf.sample
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/mogorman/asterisk-xmpp/configs/jabber.conf.sample
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/mogorman/asterisk-xmpp/configs/jabber.conf.sample
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: team/mogorman/asterisk-xmpp/include/asterisk/jabber.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/mogorman/asterisk-xmpp/include/asterisk/jabber.h
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/mogorman/asterisk-xmpp/include/asterisk/jabber.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: team/mogorman/asterisk-xmpp/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/res/Makefile?rev=19499&r1=19498&r2=19499&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/res/Makefile (original)
+++ team/mogorman/asterisk-xmpp/res/Makefile Tue Apr 11 20:56:22 2006
@@ -36,7 +36,7 @@
 
 #ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/iksemel.h),)
 #  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/iksemel.h),)
-#     MODS:=$(filter-out res_xmpp.so,$(MODS))
+#     MODS:=$(filter-out res_jabber.so,$(MODS))
 #  else
 #     XMPPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libiksemel.so)
 #  endif
@@ -169,7 +169,7 @@
 res_osp.so: res_osp.o $(OSPLIB)
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OSPLIB) $(CRYPTO_LIBS)
 
-res_xmpp.so: res_xmpp.o
+res_jabber.so: res_jabber.o
 	$(CC) $(SOLINK) -o $@ $< $(XMPPLIB) 
 
 %.so : %.o

Copied: team/mogorman/asterisk-xmpp/res/res_jabber.c (from r19498, team/mogorman/asterisk-xmpp/res/res_xmpp.c)
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/res/res_jabber.c?p2=team/mogorman/asterisk-xmpp/res/res_jabber.c&p1=team/mogorman/asterisk-xmpp/res/res_xmpp.c&r1=19498&r2=19499&rev=19499&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/res/res_xmpp.c (original)
+++ team/mogorman/asterisk-xmpp/res/res_jabber.c Tue Apr 11 20:56:22 2006
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.43 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/channel.h"
 #include "asterisk/jabber.h"

Propchange: team/mogorman/asterisk-xmpp/res/res_jabber.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/mogorman/asterisk-xmpp/res/res_jabber.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/mogorman/asterisk-xmpp/res/res_jabber.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain