[asterisk-commits] phsultan: trunk r81651 - in /trunk: ./ res/res_jabber.c

[SVN commits to the Asterisk project]

Author: phsultan
Date: Thu Sep  6 09:24:29 2007
New Revision: 81651

URL: http://svn.digium.com/view/asterisk?view=rev&rev=81651
Log:
Merged revisions 81650 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81650 | phsultan | 2007-09-06 16:20:54 +0200 (Thu, 06 Sep 2007) | 3 lines

According to both RFC 3920 - section 9.1.2 - and Google's XMPP server
complaint, if set, the 'from' attribute must be set to the user's full
JID.
........

Modified:
    trunk/   (props changed)
    trunk/res/res_jabber.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_jabber.c?view=diff&rev=81651&r1=81650&r2=81651
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Thu Sep  6 09:24:29 2007
@@ -1402,7 +1402,7 @@
 			if(query && iq)  {
 				iks_insert_attrib(iq, "type", "get");
 				iks_insert_attrib(iq, "to", pak->from->full);
-				iks_insert_attrib(iq,"from",iks_find_attrib(pak->x,"to"));
+				iks_insert_attrib(iq,"from", client->jid->full);
 				iks_insert_attrib(iq, "id", client->mid);
 				ast_aji_increment_mid(client->mid);
 				iks_insert_attrib(query, "xmlns", "http://jabber.org/protocol/disco#info");