[asterisk-commits] mjordan: branch mjordan/12-messaging r419204 - in /team/mjordan/12-messaging:...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Jul 22 11:33:12 2014
New Revision: 419204

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=419204
Log:
Fix conficts

Modified:
    team/mjordan/12-messaging/   (props changed)
    team/mjordan/12-messaging/res/res_xmpp.c

Propchange: team/mjordan/12-messaging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 22 11:33:12 2014
@@ -1,1 +1,1 @@
-/branches/12:1-419169
+/branches/12:1-419203

Modified: team/mjordan/12-messaging/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/12-messaging/res/res_xmpp.c?view=diff&rev=419204&r1=419203&r2=419204
==============================================================================
--- team/mjordan/12-messaging/res/res_xmpp.c (original)
+++ team/mjordan/12-messaging/res/res_xmpp.c Tue Jul 22 11:33:12 2014
@@ -3803,6 +3803,8 @@
 			ast_log(LOG_WARNING, "JABBER: Not Supported\n");
 		} else if (res == IKS_NET_DROPPED) {
 			ast_log(LOG_WARNING, "JABBER: Dropped?\n");
+		} else if (res == IKS_NET_UNKNOWN) {
+			ast_debug(5, "JABBER: Unknown\n");
 		}
 
 	} while (1);