[asterisk-commits] branch mogorman/asterisk-xmpp r9152 - in /team/mogorman/asterisk-xmpp: ./ res/

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Sat Feb  4 18:43:26 2006
New Revision: 9152

URL: http://svn.digium.com/view/asterisk?rev=9152&view=rev
Log:
fixes, thanks marko

Modified:
    team/mogorman/asterisk-xmpp/Makefile
    team/mogorman/asterisk-xmpp/res/res_xmpp.c

Modified: team/mogorman/asterisk-xmpp/Makefile
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/Makefile?rev=9152&r1=9151&r2=9152&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/Makefile (original)
+++ team/mogorman/asterisk-xmpp/Makefile Sat Feb  4 18:43:26 2006
@@ -74,7 +74,7 @@
 #endif
 
 # Optional debugging parameters
-DEBUG_THREADS = #-DDUMP_SCHEDULER #-DDEBUG_SCHEDULER #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
+DEBUG_THREADS = -DDEBUG_THREADS #-DDUMP_SCHEDULER #-DDEBUG_SCHEDULER #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
 
 # Uncomment next one to enable ast_frame tracing (for debugging)
 TRACE_FRAMES = #-DTRACE_FRAMES

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=9152&r1=9151&r2=9152&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/res/res_xmpp.c (original)
+++ team/mogorman/asterisk-xmpp/res/res_xmpp.c Sat Feb  4 18:43:26 2006
@@ -1227,7 +1227,7 @@
 		asterisk->component=AXI_COMPONENT;
 	if(!strcasecmp(utype,"client"))
 		asterisk->component=AXI_CLIENT;
-
+	ASTOBJ_CONTAINER_INIT(&asterisk->buddies);
 	while(var)
 	{
 		if(!strcasecmp(var->name,"username"))
@@ -1332,7 +1332,7 @@
 	}
 
 	cat = ast_category_browse(cfg,NULL);
-	
+	ASTOBJ_CONTAINER_INIT(&masters);
 	while(cat) {
 		if(strcasecmp(cat, "general")) {
 			utype = ast_variable_retrieve(cfg, cat, "type");