[asterisk-commits] dvossel: branch dvossel/gtalk_fixup r290971 - /team/dvossel/gtalk_fixup/chann...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Oct  8 15:36:56 2010
New Revision: 290971

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=290971
Log:
better Google Voice client detection

Modified:
    team/dvossel/gtalk_fixup/channels/chan_gtalk.c

Modified: team/dvossel/gtalk_fixup/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/gtalk_fixup/channels/chan_gtalk.c?view=diff&rev=290971&r1=290970&r2=290971
==============================================================================
--- team/dvossel/gtalk_fixup/channels/chan_gtalk.c (original)
+++ team/dvossel/gtalk_fixup/channels/chan_gtalk.c Fri Oct  8 15:36:56 2010
@@ -976,7 +976,7 @@
 			if (strstr(resources->resource, "gmail")) {
 				ctype = AJI_CLIENT_GMAIL;
 			}
-		} else if (strstr(them, "@voice.google.com")) {
+		} else if ((*them == '+') || (strstr(them, "@voice.google.com"))) {
 			snprintf(idroster, sizeof(idroster), "%s/srvres", them);
 			ctype = AJI_CLIENT_GOOGLE_VOICE;
 		} else {
@@ -1225,8 +1225,9 @@
 
 	/* Make sure our new call doesn't exist yet */
 	from = iks_find_attrib(pak->x,"to");
-	if(!from)
+	if(!from) {
 		from = client->connection->jid->full;
+	}
 
 	while (tmp) {
 		if (iks_find_with_attrib(pak->x, "session", "id", tmp->sid) || !strcmp(iks_find_attrib(pak->query, "id"), tmp->sid)) {